Mathieu Magnin
8577563dd0
Merge pull request #1408 from betagouv/fix_1383-english_apidoc
...
Fix 1383 english apidoc
2018-02-08 17:59:20 +01:00
Frederic Merizen
fe4e57af6c
[ Fix #1389 ] Force French language
...
In #1383 , a misconfigured gem was corrupting a global I18n variable
that was persisten across requests, resulting in #1389 , #1392 and #1398 .
This commit prevents future corruptions of locales.
2018-02-08 16:20:32 +01:00
Frederic Merizen
1dc413e313
[ Fix #1383 ] Force french language for apidoc
...
Also fixes #1389 , #1392 and #1398
2018-02-08 16:20:22 +01:00
gregoirenovel
4c6cd01139
Merge branch 'dev'
2018-02-07 17:27:59 +01:00
gregoirenovel
191b2c1629
Merge pull request #1381 from betagouv/rails-5-2
...
Bump rails to 5.2.0.rc1
2018-02-07 16:23:31 +01:00
gregoirenovel
a1015517cf
Merge branch 'dev'
2018-02-07 16:21:17 +01:00
gregoirenovel
29d9b03672
Bump rails to 5.2.0.rc1
2018-02-07 16:18:42 +01:00
Mathieu Magnin
2a5963f59b
Merge pull request #1402 from betagouv/fix-1296
...
Fix 1296 - Birthday field is optional in procedure
2018-02-07 16:16:31 +01:00
Mathieu Magnin
aeaa156f8b
Unused method removed
2018-02-07 15:57:49 +01:00
Mathieu Magnin
50f35ee905
[ Fix #1296 ] Birthday field is optional in procedure
2018-02-07 15:57:48 +01:00
LeSim
89417da331
Merge pull request #1401 from betagouv/fix_manager
...
Manager: regenerate views template to match the new version
2018-02-07 15:48:29 +01:00
simon lehericey
9297cbc642
Manager: regenerate views template to match the new version
2018-02-07 15:43:16 +01:00
gregoirenovel
b1c273e254
Merge pull request #1399 from betagouv/fix-478
...
[Fix #478 ] /recherche can deal with very big int
2018-02-07 13:04:01 +01:00
Mathieu Magnin
d49659fc73
[ Fix #478 ] /recherche can deal with very big int ☺️
2018-02-07 11:56:22 +01:00
gregoirenovel
ba3d1fb729
Merge branch 'dev'
2018-02-07 10:42:54 +01:00
gregoirenovel
63a6e62bbb
Merge pull request #1400 from betagouv/bump-more-gems
...
Bump more gems
2018-02-07 10:31:57 +01:00
gregoirenovel
f4e2bf2bca
Bump default gems
...
- chunky-png
- administrate
- kaminari
- rails
- uglifier
2018-02-07 10:27:26 +01:00
Mathieu Magnin
d644fabe2a
Merge pull request #1396 from betagouv/mmagn-comments
...
Mmagn comments
2018-02-07 10:25:49 +01:00
gregoirenovel
6320bfffbf
Improve a comment
2018-02-06 14:07:20 +01:00
gregoirenovel
9764a0af8d
Add back content_type
...
I forgot to specify it in
7ccae2c4f1
2018-02-06 14:07:20 +01:00
gregoirenovel
c5c330e1df
Drop the Notifications table
2018-02-06 14:07:20 +01:00
gregoirenovel
142241dd16
Remove notifications
2018-02-06 14:07:20 +01:00
Mathieu Magnin
6f325b6756
Merge pull request #1301 from tchak/cleanup-browser
...
Remove global BROWSER and use browser helper
2018-02-06 11:12:08 +01:00
Paul Chavard
8a55ac79f1
Remove global BROWSER and use browser helper
2018-02-05 10:35:51 +01:00
gregoirenovel
4afbda9c7b
Merge branch 'dev'
2018-02-02 10:35:38 +01:00
gregoirenovel
aadc7c79dd
Merge pull request #1394 from betagouv/revert-forked-devise
...
Revert "Point to a forked devise to fix build errors"
2018-02-01 17:13:35 +01:00
gregoirenovel
7d6b5f8426
Revert "Point to a forked devise to fix build errors"
...
This reverts commit 1b58bfad3e
.
2018-02-01 17:08:17 +01:00
Frederic Merizen
3d31fcca4b
Merge pull request #1393 from betagouv/fix_1012-envoyer_un_dossier_a_un_autre_accompagnateur
...
[Fix #1012 ] Send dossier to other accompagnateur
2018-02-01 17:04:26 +01:00
Frederic Merizen
d919d62cf7
[ Fix #1012 ] Send dossier to other accompagnateur
2018-02-01 16:58:01 +01:00
Paul Chavard
9576a82d2b
Revert "Bump default gems"
...
This reverts commit c67f692ad2
.
2018-01-31 16:30:38 +01:00
Paul Chavard
9dae8b0cf2
Revert "Disable assets precompile on CI"
...
This reverts commit ff87e09342
.
2018-01-31 16:23:40 +01:00
Paul Chavard
7ce5b82c09
Revert "Commit compiled assets"
...
This reverts commit db18d54a32
.
2018-01-31 16:23:40 +01:00
Paul Chavard
ff87e09342
Disable assets precompile on CI
2018-01-31 16:11:49 +01:00
Paul Chavard
db18d54a32
Commit compiled assets
2018-01-31 16:11:00 +01:00
gregoirenovel
0299525387
Merge pull request #1384 from betagouv/devise-edge
...
Point to a forked devise to fix build errors
2018-01-31 12:44:33 +01:00
gregoirenovel
1b58bfad3e
Point to a forked devise to fix build errors
2018-01-31 12:18:24 +01:00
gregoirenovel
8a998fea5b
Merge pull request #1382 from betagouv/bump-devise
...
Bump devise
2018-01-31 12:03:30 +01:00
gregoirenovel
87acf63f91
Bump devise
2018-01-31 11:56:02 +01:00
gregoirenovel
8f74cfd571
Change Circle cache key
2018-01-31 11:26:15 +01:00
gregoirenovel
ef6db46805
Merge branch 'dev'
2018-01-31 10:46:52 +01:00
gregoirenovel
8a078d8c59
Merge pull request #1380 from betagouv/bump-more-gems
...
Bump more gems
2018-01-31 10:28:22 +01:00
gregoirenovel
c67f692ad2
Bump default gems
...
- chunky-png
- administrate
- kaminari
- rails
- uglifier
2018-01-30 16:56:51 +01:00
gregoirenovel
a38d96b2f8
Disable a failing test
2018-01-30 16:56:51 +01:00
gregoirenovel
c2e0959d6c
Fix a test
2018-01-30 16:56:49 +01:00
gregoirenovel
f306dd636e
Refactor some complex code
2018-01-30 16:56:49 +01:00
gregoirenovel
2da724d681
Remove an unused Gestionnaire method and its tests
...
The tests would fail with rails 5.1
2018-01-30 16:56:49 +01:00
gregoirenovel
7ccae2c4f1
render nothing: true has been removed from Rails
...
Use head instead
2018-01-30 16:56:49 +01:00
gregoirenovel
3fa9774123
params is now an object and no longer a hash
2018-01-30 16:56:46 +01:00
gregoirenovel
6afaf42e6a
The "through" relation used in a HasManyThrough must be declared first
2018-01-30 16:40:04 +01:00
gregoirenovel
5b706cc7d4
Add missing params wrapping to some tests
2018-01-30 16:40:04 +01:00