Commit graph

5486 commits

Author SHA1 Message Date
gregoirenovel
42a06959cb
Merge pull request #2136 from betagouv/fix-design
Fix design
2018-06-21 15:02:58 +02:00
Mathieu Magnin
3058c4350f Fix design 2018-06-21 15:02:12 +02:00
gregoirenovel
b566fca3fb Merge branch 'dev' 2018-06-21 12:23:49 +02:00
Mathieu Magnin
ef45f9d444
Merge pull request #2131 from betagouv/fix-rake-specs
spec: only load tasks once
2018-06-21 12:15:32 +02:00
Mathieu Magnin
4f93354107
Merge branch 'dev' into fix-rake-specs 2018-06-21 11:44:02 +02:00
Mathieu Magnin
44e75d27b1
Merge pull request #2134 from betagouv/useless-method
Remove an unused method
2018-06-21 11:43:43 +02:00
Mathieu Magnin
d0d55c796d
Merge branch 'dev' into useless-method 2018-06-21 11:38:19 +02:00
Mathieu Magnin
706c67e674
Merge pull request #2121 from betagouv/make-assets-faster-by-default
config: make assets compilation faster in development
2018-06-21 11:38:11 +02:00
Mathieu Magnin
f714bf7b6f
Merge branch 'dev' into make-assets-faster-by-default 2018-06-21 11:31:00 +02:00
Mathieu Magnin
c4f1b2658e
Merge pull request #2133 from betagouv/add-gestionnaires-to-procedures-manager
Affiche les accompagnants d'une démarche dans le Manager (et vice-versa)
2018-06-21 11:30:28 +02:00
Mathieu Magnin
c49b88453f
Merge branch 'dev' into add-gestionnaires-to-procedures-manager 2018-06-21 11:22:52 +02:00
Mathieu Magnin
a704dbdfae
Merge pull request #2135 from betagouv/fix-siret-display
Show the etablissement SIRET, not the siege social SIRET
2018-06-21 10:35:22 +02:00
gregoirenovel
901748c5aa Show the etablissement SIRET, not the siege social SIRET 2018-06-20 18:35:19 +02:00
gregoirenovel
3c331b65a5 Remove an unused method 2018-06-20 18:30:41 +02:00
Mathieu Magnin
d6e211f2df
Merge pull request #2132 from betagouv/fix_2067_confirmation_mail_lost
[fix #2067] Resend confirmation mail if the user is not confirmed
2018-06-20 17:39:25 +02:00
Pierre de La Morinerie
e953481fd0 manager: display procedures on the gestionnaires page 2018-06-20 17:34:11 +02:00
Pierre de La Morinerie
99b9f42b21 manager: display gestionnaires on the procedure page 2018-06-20 17:33:59 +02:00
simon lehericey
c3610fc96e [fix #2067] Resend confirmation mail if the user is not confirmed 2018-06-20 13:30:32 +02:00
Pierre de La Morinerie
9f502c536b spec: only load tasks once
When a task is loaded several times, a single call of `task.invoke`
will run the task several times too.

This made `add_annotion_privee_to_procedure_spec` fail when it wasn't
the first task being tested.
2018-06-20 11:35:20 +02:00
Pierre de La Morinerie
90b1887702
Merge pull request #2115 from betagouv/spring
Ajoute spring aux binstubs par défaut
2018-06-20 11:35:13 +02:00
Pierre de La Morinerie
ae5754e6c6 spring: add Spring to binstubs of default commands
Binstubs generated with `bundle exec spring binstub --all`.

This allows to type `bin/rails`, `bin/rake` or `bin/rspec` and have it
using Spring (rather than `bin/spring rails`).

On my machine it produces a nice speedup:

- `rake -T`: 5.6s
- `bin/rake -T`: 0.25s

The startup speedup for `rails` and `rspec` is similar.
2018-06-20 10:31:15 +02:00
Pierre de La Morinerie
c2bc151803 spring: add generated spring binstub
File generated with `bundle exec spring binstub`.

Use it with `bin/spring rails`, or `bin/spring rspec`.
2018-06-20 10:31:15 +02:00
Mathieu Magnin
178959ea13 Merge branch 'dev' 2018-06-20 09:21:46 +02:00
LeSim
87140e5e37
Merge pull request #2130 from betagouv/fix_sprockets_vulnerability
Fix CVE-2018-3760
2018-06-20 09:08:57 +02:00
Mathieu Magnin
9e4cc14f70 Fix CVE-2018-3760 https://blog.heroku.com/rails-asset-pipeline-vulnerability 2018-06-20 08:59:42 +02:00
Mathieu Magnin
3b5b57f3c5 Merge branch 'dev' 2018-06-19 18:02:50 +02:00
gregoirenovel
42133f5b85
Merge pull request #2126 from betagouv/fix_select2_overflow
Fix select2 overflow (1 line changed 🚀)
2018-06-19 18:01:19 +02:00
Mathieu Magnin
071e234150 Fix select2 overflow 2018-06-19 17:52:16 +02:00
Pierre de La Morinerie
fa46f7f0d7 config: make assets compilation faster in development 2018-06-19 16:49:14 +02:00
gregoirenovel
cee12a1081 Merge branch 'dev' 2018-06-19 16:46:25 +02:00
gregoirenovel
076f48629e
Merge pull request #2099 from betagouv/contact-infos
Affiche les informations du service en bas du formulaire du dossier
2018-06-19 16:42:31 +02:00
Pierre de La Morinerie
c4057a0807 dossier: display user infos on edit page 2018-06-19 16:27:53 +02:00
Pierre de La Morinerie
c1db26b2e1 service: add explanation about contact infos 2018-06-19 16:23:43 +02:00
Pierre de La Morinerie
755600acf4 layout: move the landing footer to its own file 2018-06-19 16:23:43 +02:00
Pierre de La Morinerie
60475d0165 factories: add parenthesis around method arguments 2018-06-19 16:01:35 +02:00
Pierre de La Morinerie
d394555d8b
Merge pull request #2112 from betagouv/frederic/fix_1421-move_type_specific_code_to_type_de_champ
#1421 move type specific code to typed champ classes
2018-06-19 15:25:31 +02:00
Frederic Merizen
e99931527b [#1421] Move pays to PaysChamp 2018-06-19 15:20:01 +02:00
Frederic Merizen
0239f936d7 [#1421] Move departements to DepartementChamp 2018-06-19 15:20:01 +02:00
Frederic Merizen
5b59bce0b6 [#1421] Move regions to RegionChamp 2018-06-19 15:20:01 +02:00
Frederic Merizen
95666238ea [#1421] Move piece justificative error code to piece justificative champ 2018-06-19 15:20:01 +02:00
Frederic Merizen
6af27a7190 [#1421] Move same_hour / same_minute to typed champ 2018-06-19 15:20:01 +02:00
Frederic Merizen
41734092b2 [#1421] Move type specific for_export code to typed champs 2018-06-19 15:20:01 +02:00
Frederic Merizen
ee8616fb97 [#1421] Move type specific to_s implementations to typed champs 2018-06-19 15:20:01 +02:00
Frederic Merizen
c2f199c5aa [#1421] Move piece justificative specific validation to PieceJustificativeChamp 2018-06-19 15:20:01 +02:00
Frederic Merizen
c690d3819e [#1421] Move type-specific before_save to typed champs 2018-06-19 15:20:01 +02:00
Mathieu Magnin
fac9c6cf47
Merge pull request #2120 from betagouv/dev
MEP 2016-06-19-01
2018-06-19 14:37:19 +02:00
gregoirenovel
75bdb8c4bc
Merge pull request #2119 from betagouv/ui-fixes
UI fixes
2018-06-19 13:57:01 +02:00
Pierre de La Morinerie
426e61777c dossier: make the "Save changes" button title more meaningful 2018-06-19 13:46:43 +02:00
Pierre de La Morinerie
a4382ac198 dossiers: asterisque -> astérisque 2018-06-19 13:46:43 +02:00
Pierre de La Morinerie
c0da0ba52c publish-modal: fix the textfield vertical alignement 2018-06-19 13:46:43 +02:00