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

5273 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pierre de La Morinerie
2cfa1b441d config: add default config files to the source 2018-06-18 13:13:59 +02:00
Mathieu Magnin
b652e93e2e Merge branch 'dev' 2018-06-18 11:26:09 +02:00
Mathieu Magnin
c4031b7dc4
Merge pull request #2079 from betagouv/frederic/fix_2068-french_mails 
[Fix #2068] Use mail templates from application rather than devise
 2018-06-18 10:53:26 +02:00
Frederic Merizen
78fa6945cb [#2068] Use official French word for mail 2018-06-18 10:42:04 +02:00
Frederic Merizen
354c76e26f [#2068] Remove duplicate devise translations 2018-06-18 10:42:04 +02:00
Frederic Merizen
dd4e6eaa11 [#2068] Add missing devise translations 2018-06-18 10:42:04 +02:00
Frederic Merizen
bae7a2dd3c [Fix #2068] Use mail templates from application rather than devise 
`default template_path:` was the documented way, but wasn’t working
(and there was no hint in the source code of Devise that it could
work)

Therefore, let’s override `template_paths` instead and stop worrying
 2018-06-18 10:42:03 +02:00
Mathieu Magnin
41dbd9d599
Merge pull request #2111 from betagouv/no-seed 
deploy: don't seed the database
 2018-06-18 10:26:23 +02:00
Pierre de La Morinerie
15511d0863 deploy: don't seed the database 
The database should be seeded only when deploying on a fresh new
environment – like a local setup or a review app.

Persistent testing and production environment shouldn't be seeded.
 2018-06-15 12:28:18 +02:00
LeSim
849a093709
Merge pull request #2103 from betagouv/manager_gestionnaire_button 
Manager: can reinvite a gestionnaire
 2018-06-14 17:19:18 +02:00
simon lehericey
eee41cbf39 Manager: can reinvite a gestionnaire 2018-06-14 16:41:10 +02:00
Mathieu Magnin
9797b11b45
Merge pull request #2097 from betagouv/fix-publish-tooltip 
Correction de l'affichage du tooltip de publication
 2018-06-13 13:54:27 +02:00
Pierre de La Morinerie
0bef35946f procedure: make sentence shorter 
Before: "Affectez des accompagnateurs à votre procédure.Affectez un
service à votre procédure.

After: "Affectez des accompagnateurs et un service à votre procédure."
 2018-06-13 11:59:40 +02:00
Pierre de La Morinerie
367ac0dd5a procedure: avoid tooltip being hidden by the navbar 2018-06-13 11:59:40 +02:00
Mathieu Magnin
0bd31c6d4f
Merge pull request #2093 from betagouv/rake-verbosity 
tasks: silence output of tasks during tests
 2018-06-13 11:48:29 +02:00
Pierre de La Morinerie
790704ef58 tasks: silence output of tasks during tests 
Currently, when running specs, the output of rake tasks is spamming
the tests results.

This PR configures Rake so that it runs in quiet mode during specs. This
disables the internal messages of rake during tests.

However our own `puts` also need to be conditionned to the verbosity of
rake. Using a simple `rake_puts` helper allows the info messages to be
displayed when running the rake task manually, but not during tests.

Before:

```
$ bin/rspec spec/lib/rake
Randomized with seed 6544
1 Mails::ClosedMail to clean
cleaning Mails::ClosedMail #1
1 Mails::InitiatedMail to clean
cleaning Mails::InitiatedMail #1
1 Mails::ReceivedMail to clean
cleaning Mails::ReceivedMail #1
1 Mails::RefusedMail to clean
cleaning Mails::RefusedMail #1
1 Mails::WithoutContinuationMail to clean
cleaning Mails::WithoutContinuationMail #1
.....Champ 0/1
.Champ 0/1
.
```

After:

```
$ bin/rspec spec/lib/rake

Randomized with seed 6544
.......
```
 2018-06-13 11:05:15 +02:00
Mathieu Magnin
0490e58d0b
Merge pull request #2088 from kemenaran/initial-user 
Crée l'utilisateur initial dans les seeds
 2018-06-13 11:04:43 +02:00
Pierre de La Morinerie
e50cc68e75 Rakefile: move first user creation to db/seeds.rb 2018-06-13 10:58:23 +02:00
Pierre de La Morinerie
b0c5d8ec66 Rakefile: add task to create initial users 2018-06-13 10:58:11 +02:00
Mathieu Magnin
f2ebf48564
Merge pull request #2090 from betagouv/binstubs 
README: always use binstubs
 2018-06-13 10:51:24 +02:00
Pierre de La Morinerie
b8328b90e6 README: always use binstubs 
Otherwise we use the gem installed globally, which may not be the same
version as the gem defined in the project Gemfile.
 2018-06-13 10:45:19 +02:00
Mathieu Magnin
9960d2bb5d
Merge pull request #2095 from betagouv/frederic/fix-procedures-show 
Remove erroneous space in haml
 2018-06-13 10:26:28 +02:00
Frederic Merizen
fd2fd83aac Remove erroneous space in haml 2018-06-13 10:21:57 +02:00
Frederic Merizen
92afd15b13
Merge pull request #2092 from betagouv/frederic/fix_2089-validation_message 
[Fix #2089] Add missing validation message
 2018-06-13 09:40:42 +02:00
Mathieu Magnin
e32ec39540
Merge pull request #2091 from betagouv/dev 
MEP 2018-06-12-01 🚀
 2018-06-12 17:12:58 +02:00
Frederic Merizen
07b6089950 [Fix #2089] Add missing validation message 2018-06-12 16:36:26 +02:00
Mathieu Magnin
8bb4343b90
Merge pull request #2046 from betagouv/antivirus 
Antivirus async
 2018-06-12 15:30:14 +02:00
Mathieu Magnin
aad109e376 Add task to scan old champs pj 2018-06-12 15:12:40 +02:00
Mathieu Magnin
6289a719ef Display virus scan status with pj champs 2018-06-12 15:12:39 +02:00
Mathieu Magnin
cd4615b10d When a new PJ is uploaded enqueue a anti virus scan job 2018-06-12 15:12:39 +02:00
Mathieu Magnin
927cd3c6f4 Create virus scan model to store clamav result 2018-06-12 15:12:38 +02:00
Frederic Merizen
645d112f5c
Merge pull request #2086 from kemenaran/readme-fixes 
README: petites améliorations
 2018-06-12 12:01:15 +02:00
Pierre de La Morinerie
0621cb0240 README: remove the explicit migration for test env 
Since Rails 4.1, applications using `maintain_test_schema` do not need
to run an explicit migration in the test env.

See https://relishapp.com/rspec/rspec-rails/docs/upgrade
 2018-06-11 17:35:37 +02:00
Pierre de La Morinerie
03f82ad0f0 README: use rails rather than rake where possible 
Most rake commands are aliased into `rails` since Rails 5.0.
 2018-06-11 17:33:27 +02:00
Pierre de La Morinerie
b5ca3ca653 README: fix some typos 2018-06-11 17:24:59 +02:00
gregoirenovel
c9bfe6b2e4 Merge branch 'dev' 2018-06-11 12:38:30 +02:00
gregoirenovel
dad5818891
Merge pull request #2083 from betagouv/email-fix 
Fix an email
 2018-06-11 12:38:07 +02:00
gregoirenovel
c2b97c68e1 Fix an email 2018-06-11 11:56:52 +02:00
gregoirenovel
69ecd7f4bb
Merge pull request #2080 from betagouv/frederic/fix_2071-text_only_mails 
fix 2071 text only mails
 2018-06-10 14:15:10 +02:00
Frederic Merizen
3ba0dd1620 [#2071] Fix test now that mails are multipart 2018-06-10 11:53:51 +02:00
Frederic Merizen
be82c1c390 [#2071] Sort Gemfile 2018-06-10 11:39:48 +02:00
Frederic Merizen
ad040e354a [Fix #2071] Let premailer generate a plain text version of html emails 2018-06-09 09:00:33 +02:00
LeSim
fd0917ab97
Merge pull request #2076 from betagouv/dev 
2018-06-08-02
 2018-06-08 16:44:40 +02:00
LeSim
6e1bff0d5d
Merge pull request #2075 from betagouv/fix_2072_user_cannot_modify_a_dossier_in_instruction 
[fix #2072] DossierController: check the user can update the dossier
 2018-06-08 16:38:59 +02:00
simon lehericey
e11392981d [fix #2072] DossierController: check the user can update the dossier 2018-06-08 16:24:29 +02:00
gregoirenovel
db4c0e11d2
Merge pull request #2074 from betagouv/fix-typo 
Fix a typo
 2018-06-08 15:16:58 +02:00
gregoirenovel
24e37842ee Fix a typo 2018-06-08 15:14:22 +02:00
gregoirenovel
0f600045c1 Merge branch 'dev' 2018-06-08 10:58:39 +02:00
gregoirenovel
19f5c66faa
Merge pull request #2058 from betagouv/preactivate-admin-gestionnaire-users 
Retroactively pre(?)activate users for gestionnaires and administrateurs
 2018-06-08 10:58:16 +02:00
Frederic Merizen
7c6b60bfcb Retroactively pre(?)activate users for gestionnaires and administrateurs 2018-06-08 10:49:31 +02:00