Commit graph

8662 commits

Author SHA1 Message Date
Frederic Merizen
83adb8dcba Bump shoulda matchers
to avoid the warning about the deprecation of BigDecimal.new
2019-03-01 19:00:52 +01:00
Paul Chavard
8fac9167ca
Merge pull request #3531 from betagouv/frederic/fix_delai_instruction_test_after_february
Fix test for the 2 months following February
2019-03-01 18:51:02 +01:00
Frederic Merizen
d053a9bb8d Fix test for the 2 months following February
The problem was caused by the variable lenght of 2.months.ago, used
in the test.
During the period from March 1st to April 29th, because February
is so short, the message would change from 'delai de 2 mois'
to 'delai de environ 2 mois', causing the test to fail.
2019-03-01 18:25:15 +01:00
LeSim
8ba8146a4a
Merge pull request #3527 from betagouv/active_storage_temp_url_1_hour_validity
ActiveStorage: temp url are valid for 1 hour
2019-02-28 18:55:06 +01:00
simon lehericey
2920769a68 ActiveStorage: temp url are valid for 1 hour 2019-02-28 18:36:28 +01:00
Paul Chavard
c9f9de4f2c
Merge pull request #3519 from betagouv/improve-perf-v2
Add procedure_id index to type_de_piece_justificative
2019-02-28 12:16:49 +01:00
Mathieu Magnin
2b763e4484 Add procedure_id index to type_de_piece_justificative 2019-02-27 15:45:45 +01:00
Mathieu Magnin
ce3d626239
Merge pull request #3513 from betagouv/revert-3419-fix-3370
Revert "Redesign admin roles menu"
2019-02-26 18:02:53 +01:00
Frederic Merizen
083698a487
Revert "Redesign admin roles menu" 2019-02-26 17:51:26 +01:00
Paul Chavard
f6e8ffb582
Merge pull request #3512 from tchak/create-new-procedures-with-administrateurs
Create new procedures with administrateurs
2019-02-26 16:46:42 +01:00
Paul Chavard
f7af01e0dc Create new procedures with administrateurs 2019-02-26 16:38:58 +01:00
Mathieu Magnin
d72cc7db0a
Merge pull request #3503 from betagouv/fix-sentry-238
Fix Sentry 238
2019-02-26 15:27:43 +01:00
Mathieu Magnin
b3c0a261d7 Fix Sentry 238 2019-02-26 15:08:13 +01:00
LeSim
42c3bd5db0
Merge pull request #3509 from betagouv/improve-perf
Improve perf
2019-02-26 14:48:15 +01:00
Mathieu Magnin
ff1f59a882 Add index Procedure_id on TypesDeChamp 2019-02-26 12:05:49 +01:00
Mathieu Magnin
fed1f3e921 Use query filter instead of array.reject 2019-02-26 12:05:49 +01:00
Mathieu Magnin
f5933ef2e5
Merge pull request #3505 from betagouv/ruby-2.6.1
Ruby 2.6.1
2019-02-25 17:23:20 +01:00
Mathieu Magnin
1be87b4b78 Ruby 2.6.1 2019-02-25 17:16:50 +01:00
Mathieu Magnin
c5f045c8e1
Merge pull request #3225 from betagouv/ruby-2-6
Ruby 2.6.1
2019-02-25 17:07:26 +01:00
gregoirenovel
cfcbe45695 Bump the bundler version 2019-02-25 16:57:51 +01:00
gregoirenovel
27460b55a3 Use the new merge with multiple arguments 2019-02-25 16:57:51 +01:00
gregoirenovel
6ae5ffb2c6 Use ruby 2.6 2019-02-25 16:57:50 +01:00
LeSim
8124035800
Merge pull request #3499 from betagouv/update-bootstrap-sass
Gem update bootstrap-sass (>= 3.4.1)
2019-02-25 13:42:34 +01:00
Mathieu Magnin
28fd9051d7 Gem update bootstrap-sass (>= 3.4.1) 2019-02-25 12:01:47 +01:00
Paul Chavard
4d9397f9d5
Merge pull request #3446 from betagouv/fix-3365
Fix 3365 formulaire de contact usager avec réponse automatique
2019-02-21 18:13:51 +01:00
Paul Chavard
146e8ba2aa Revrite with unobtrusive js 2019-02-21 18:05:47 +01:00
Chaïb Martinez
62d7e328c9 New design
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 17:50:58 +01:00
Chaïb Martinez
0a3d87f461 Texte change
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 17:50:58 +01:00
Chaïb Martinez
6f727f4cb1 Add responses messages
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 17:50:58 +01:00
Chaïb Martinez
e9c4ff41a7 Minor changes 2019-02-21 17:50:58 +01:00
Chaïb Martinez
7124965ba8 Add JS script 2019-02-21 17:50:58 +01:00
Chaïb Martinez
9edc7ab2be Minor css changes 2019-02-21 17:50:58 +01:00
Chaïb Martinez
93a0edcce0 Il y avait une issue crée, je push sur une nouvelle branche 2019-02-21 17:50:58 +01:00
Pierre de La Morinerie
0fdd197b98
Merge pull request #3489 from betagouv/philemon95-patch-2
Ajout d'un texte pour inciter les usagers à ne pas créer de compte admin
2019-02-21 17:16:23 +01:00
Pierre de La Morinerie
d384b6b07f card: add spacing to paragraphs 2019-02-21 16:49:16 +01:00
Pierre de La Morinerie
8f3d4de6c3 patron: don't override p style on the patron page
It adds a global styles that messes with the elements we are trying to
present.
2019-02-21 16:49:16 +01:00
philemon95
0820db0161 demande: add text to prevent users from creating an admin account 2019-02-21 16:49:16 +01:00
philemon95
fb5e24028f Update new.html.haml 2019-02-21 16:49:16 +01:00
Pierre de La Morinerie
9d1aea7bb8
Merge pull request #3481 from betagouv/fix-pj-link
pj_link: fix an exception when the scan is not associated yet
2019-02-21 16:29:41 +01:00
Pierre de La Morinerie
066672803b pj_link: fix an exception when the scan is not associated yet 2019-02-21 16:00:33 +01:00
Mathieu Magnin
5fa6778e49
Merge pull request #3419 from betagouv/fix-3370
Redesign admin roles menu
2019-02-21 15:24:25 +01:00
Chaïb Martinez
9f1c089b30 Minor css changes
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 15:09:34 +01:00
Chaïb Martinez
221ed952d1 Redesign admin roles menu 2019-02-21 14:53:49 +01:00
Chaïb Martinez
b532d6521e Add switch account type layout
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 14:53:49 +01:00
Chaïb Martinez
97fda013c0 Minor texte changes
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 14:53:49 +01:00
Chaïb Martinez
e29415d401 remove switch button
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 14:53:49 +01:00
Chaïb Martinez
2e2424ec3f Minor html/css change 2019-02-21 14:53:49 +01:00
Pierre de La Morinerie
d3ab6f8619
Merge pull request #3484 from Keirua/feat/3463-balise-nom-service
#3463 - Ajout d'une balise pour le nom du service
2019-02-21 12:50:03 +01:00
clemkeirua
71bff0812c ajout d'un test pour caractériser le cas service = null 2019-02-21 12:34:53 +01:00
clemkeirua
236f73f838 ajout d'une balise pour le nom du service 2019-02-21 12:18:44 +01:00