DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
6269 commits 2 branches 1166 tags 85 MiB
Commit graph

6269 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Chavard
d92364b90b Add user_geo_area do champ carte 2018-11-20 10:53:14 +01:00
Paul Chavard
971a08c92a Add expose legacy carto api flag 2018-11-20 10:53:14 +01:00
Paul Chavard
18815e88a3 Rename champ.zones to champ.geo_json 2018-11-20 10:53:14 +01:00
Paul Chavard
2462e42b53 Stop using legacy api carto after migration 2018-11-20 10:53:14 +01:00
Paul Chavard
44ca6a2d02 Task to migrate carto to champ carte 2018-11-20 10:53:14 +01:00
Paul Chavard
e63fd9d573 Add migrated flag to module_api_cartos 2018-11-20 10:53:14 +01:00
Frederic Merizen
90d4d8a393
Merge pull request #3000 from betagouv/frederic/fix_2999-bad_redirect_after_login 
[#2999] Rediriger vers la bonne page apres login
 2018-11-16 15:54:01 +01:00
Frederic Merizen
101e8e2588 [#2999] Rediriger vers la bonne page apres login 
(ne corrige pas le cas ou l'utilisateur est passe par le mail de confirmation)
 2018-11-16 15:44:20 +01:00
Frederic Merizen
72d0033f65
Merge pull request #2998 from betagouv/bump-gems 
Bump gems
 2018-11-16 12:21:15 +01:00
gregoirenovel
c55ae79930 Bump test gems 
- guard (2.14.2 → 2.15.0)
 2018-11-16 12:05:22 +01:00
gregoirenovel
f7225b0086 Bump development/test gems 
- rspec-rails (3.8.0 → 3.8.1)
 2018-11-16 12:05:22 +01:00
gregoirenovel
6479de1f6c Bump development gems 
- rubocop (0.59.2 → 0.60.0)
 2018-11-16 12:05:22 +01:00
gregoirenovel
dcf063f8f8 Bump warden and remove its dependency on the master branch 
Now that the fix for wardencommunity/warden#147
is present in a proper release
 2018-11-16 11:48:36 +01:00
gregoirenovel
7b98bfb025 Bump default gems 
- active_model_serializers (0.10.7 → 0.10.8)
- groupdate (4.0.2 → 4.1.0)
- rails-i18n (5.1.1 → 5.1.2)
- skylight (3.0.0 → 3.1.1)
- typhoeus (1.3.0 → 1.3.1)
 2018-11-16 11:46:38 +01:00
Frederic Merizen
b5487141b7
Merge pull request #2997 from betagouv/frederic/fix_2180-active_storage_openstack 
MAJ fog-openstack et ajout de activestorage-openstack
 2018-11-16 11:37:16 +01:00
Frederic Merizen
e69e459649 [#2180] Add activestorage-openstack 2018-11-16 11:11:40 +01:00
Frederic Merizen
d901cb286b [#2180] Bump fog-openstack 2018-11-16 11:11:39 +01:00
Frederic Merizen
6da33f2387 [#2180] Drop fog 2018-11-16 11:11:39 +01:00
Frederic Merizen
238c0c707b [#2180] Bump Carrierwave 2018-11-16 11:11:39 +01:00
gregoirenovel
31b57116ce
Merge pull request #2996 from betagouv/fix_2952_page_erreur_500 
Fix 2952 page erreur 500
 2018-11-15 18:26:54 +01:00
pengfei
233ed306e0 [fix #2952] page erreur 500 2018-11-15 18:13:32 +01:00
Mathieu Magnin
215398b47f
Merge pull request #2965 from pengfeidong/fix_2719_supprimer_filtre_long 
[fix #2719] tronquer les textes dans le filtre, max=50
 2018-11-15 15:19:46 +01:00
pengfei
0593299def tronquer uniquement label et mettre close-icon avant le text 2018-11-15 15:10:41 +01:00
pengfei
89daaedbe4 [fix #2719] tronquer les textes dans le filtre, max=50 2018-11-15 15:10:41 +01:00
Paul Chavard
dc62128ed7
Merge pull request #2968 from tchak/dossier-invite 
Move dossier invites handler to invites controller
 2018-11-14 15:28:31 +01:00
Paul Chavard
2eb61bd6ed Move dossier invites handler to invites controller 2018-11-14 15:16:49 +01:00
Pierre de La Morinerie
f3a72482a5
Merge pull request #2992 from betagouv/fix-order-dependant-test 
Fix order dependant test
 2018-11-14 14:54:51 +01:00
Pierre de La Morinerie
b6521625e4 procedure_spec: add missing Timecop.return statement 
Fix order-dependant test.
 2018-11-14 14:49:41 +01:00
Pierre de La Morinerie
35613992fe rspec: by default use the safer bisect runner for bisecting 2018-11-14 14:49:41 +01:00
Pierre de La Morinerie
10e56a30eb
Merge pull request #2991 from betagouv/ci-print-test-files 
circleci: print files used by the shell command
 2018-11-14 14:49:28 +01:00
Pierre de La Morinerie
d0bac997cb circleci: print files used by the shell command 
This allow to reproduce failures due to tests order more easily.
 2018-11-14 14:40:55 +01:00
Pierre de La Morinerie
bccb86144e
Merge pull request #2990 from betagouv/disable-rails-traces-during-tests 
spec: fix Mina enabling Rails traces during tests
 2018-11-14 14:40:29 +01:00
Pierre de La Morinerie
acc6df2662 spec: fix Mina enabling Rails traces during tests 
When requiring mina files, it automatically enables Rails traces. But
we don't want Rails traces during tests.

Fix this by disabling Rails traces before running tests.

Fix #2989
 2018-11-14 11:55:21 +01:00
Pierre de La Morinerie
7c6437b01a
Merge pull request #2986 from betagouv/restrict-dossier-time-estimation 
Restreint l'estimation de la durée de traitement à un mois
 2018-11-13 17:24:22 +01:00
Pierre de La Morinerie
83031b5cdd procedure: compute the usual instruction time only for the last month 2018-11-13 17:23:31 +01:00
Pierre de La Morinerie
b693e055b7 procedure: make usual_instruction_time spec more robust 2018-11-13 17:23:31 +01:00
Pierre de La Morinerie
b1296df4c3 procedure: refactor usual_instruction_time spec 2018-11-13 17:23:31 +01:00
Paul Chavard
9528f9a690
Merge pull request #2981 from betagouv/hides-dangerous-features-from-manager 
manager: hide dangerous features
 2018-11-13 16:50:13 +01:00
Pierre de La Morinerie
f7c586f3e4 features: add maintenance features to the 'production' group 2018-11-13 16:38:56 +01:00
Pierre de La Morinerie
b02d50dac8 manager: improve code to hide production features 2018-11-13 16:38:56 +01:00
Paul Chavard
550885f396
Merge pull request #2983 from betagouv/rename-entities-in-manager 
[Manager] Utilisation des termes métiers
 2018-11-13 11:37:22 +01:00
Pierre de La Morinerie
0eb21fe8c4 manager: localize model names 2018-11-13 11:20:12 +01:00
LeSim
8b1428ddac
Merge pull request #2755 from betagouv/fix_2703_login_link 
Send login link by mail
 2018-11-13 10:49:02 +01:00
simon lehericey
7313ca0675 Rake: enable trusted_device for some gestionnaire 2018-11-13 10:41:45 +01:00
simon lehericey
fb76197404 SessionController: flipflop trusted device 2018-11-13 10:41:45 +01:00
simon lehericey
36621bffeb FlipFlop: enable for gestionnaire 2018-11-13 10:41:45 +01:00
simon lehericey
457bc13c75 SessionController: do not display 'Connecté' when a login_link is required 2018-11-13 10:41:45 +01:00
simon lehericey
87967568b7 SessionController: if a admin is login in, redirect to admin page 2018-11-13 10:41:45 +01:00
simon lehericey
0d8d2de5a6 Session: add trusted_device cookie 2018-11-13 10:41:45 +01:00
simon lehericey
5690599289 Session: send a mail to confirm gestionnaire login 2018-11-13 10:41:45 +01:00