Commit graph

13621 commits

Author SHA1 Message Date
simon lehericey
6625c6bac3 add requested_merge_into column in user table 2021-11-04 16:10:09 +01:00
simon lehericey
894e8fdd47 move update_email check to before_action 2021-11-04 16:10:09 +01:00
dependabot[bot]
8c26874e1a
chore(deps): bump color-string from 1.5.3 to 1.6.0
Bumps [color-string](https://github.com/Qix-/color-string) from 1.5.3 to 1.6.0.
- [Release notes](https://github.com/Qix-/color-string/releases)
- [Changelog](https://github.com/Qix-/color-string/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Qix-/color-string/commits/1.6.0)

---
updated-dependencies:
- dependency-name: color-string
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-04 15:03:36 +00:00
Paul Chavard
e3b0df09f4
Merge pull request #6605 from tchak/fix-my-mac
Corrige l'environnement de développement pour apple silicon
2021-11-04 16:02:54 +01:00
Paul Chavard
36912eded5 chore(gem): update ethon gem 2021-11-04 15:53:45 +01:00
LeSim
6639f53d4e
Merge pull request #6603 from betagouv/bump_ruby_to_2.7.3
bump ruby to 2.7.3
2021-11-04 15:31:45 +01:00
simon lehericey
f06d9baf2f bump ruby to 2.7.3 2021-11-04 15:25:18 +01:00
LeSim
16d82acf5e
Merge pull request #6558 from mfaure/6557_enhance_contributing
FIX #6557 CONTRIBUTING Describe our dev best practices
2021-11-04 15:19:44 +01:00
Matthieu FAURE
e56b3e4a7a FIX #6557 CONTRIBUTING Describe our dev best practices 2021-11-04 15:12:49 +01:00
Paul Chavard
88df8a888e
Merge pull request #6588 from tchak/feat-commune-by-departement
feat(champ): ask for departement before asking for commune
2021-11-04 13:03:19 +01:00
Paul Chavard
ba0211ba52 feat(champ): ask for departement before asking for commune 2021-11-04 11:55:25 +01:00
Paul Chavard
dc56572b1d
Merge pull request #6611 from tchak/fix-destroy-avis-on-dossiers-en-construction
fix(avis): destroy avis for discarded en_construction dossiers
2021-11-04 10:21:05 +01:00
Paul Chavard
122cdacbc2 fix(avis): destroy avis for discarded en_construction dossiers 2021-11-04 10:12:44 +01:00
Paul Chavard
6008b81c19
Merge pull request #6609 from tchak/task-destroy-expired-dossiers-mae
task(dossiers): delete MAE procedures expired dossiers
2021-11-04 10:12:33 +01:00
Paul Chavard
e4317e8c7e task(dossiers): delete MAE procedures expired dossiers 2021-11-04 10:00:26 +01:00
Pierre de La Morinerie
14d3956419
Merge pull request #6610 from betagouv/improve-graphql-specs
Amélioration de la vitesse d'exécution des tests GraphQL (#6610)
2021-11-03 19:44:55 +01:00
Pierre de La Morinerie
5f2233d07d specs: reduce BCrypt complexity during tests
BCrypt is used to compute Instructeur tokens, and takes a surprisingly
ong time during specs.

Reducing the complexity to speed it up.

Speeds up this spec from 0m 57s to 0m 20s.
2021-11-03 19:38:01 +01:00
Pierre de La Morinerie
0a541d678d graphql_controller_spec: create several dossiers only when required
Creating dossiers is faster than creating a procedure, but still slow.
We can create a single dossier in the default case, and only create
several others when the example requires it.

Speeds up this spec from 0m 57s to 0m 49s.
2021-11-03 19:38:01 +01:00
Pierre de La Morinerie
f0e045ad25 graphql_controller_spec: create all types de champs only when required
Creating a procedure with all available types de champ is slow. We can
create a simpler procedure in the default case, and only create all
types de champs when the example requires it.

Speeds up this spec from 1m 55s to 0m 57s.
2021-11-03 19:38:01 +01:00
Pierre de La Morinerie
e02251c0e5 graphql_controller_spec: populate all champs only when required
Creating a dossier with available champs populated is slow. We can
create simpler dossiers in the default case, and only populate all
champs when the example requires it.

Speeds up this spec from 2mn 20s to 1m 55s.
2021-11-03 19:38:01 +01:00
Pierre de La Morinerie
bb1bc9140d graphql_controller_spec: remove unused line 2021-11-03 19:38:01 +01:00
Pierre de La Morinerie
04159056af specs: clarify spec by replacing some context by describe 2021-11-03 19:38:01 +01:00
Pierre de La Morinerie
b06183d7bf specs: rename Dossier's with_all_champs to with_populated_champs
This better reflects what the trait is used for, and disambiguate it
from the similarly named trait in the Procedure factory.
2021-11-03 19:38:01 +01:00
Pierre de La Morinerie
6c60c940d4 gems: update aasm 2021-11-03 19:38:01 +01:00
Paul Chavard
a99bb7f0d2
Merge pull request #6577 from tchak/fix-repetition-revisions
fix(revisions): fix repetitions export with revisions
2021-11-03 18:30:43 +01:00
Paul Chavard
f6b8689a97 fix(revisions): fix repetitions export with revisions 2021-11-03 18:20:48 +01:00
Paul Chavard
39c94992a7
Merge pull request #6590 from tchak/fix-create-deleted-dossier
fix(dossiers): wrap dossier discard in a transaction
2021-11-03 10:19:44 +01:00
Paul Chavard
0e2f09dd6f fix(dossiers): wrap dossier discard in a transaction
By doing this we ensure that deleted_dossier are not created when dossier is not discarded
2021-11-02 18:17:35 +01:00
Paul Chavard
47fb7e5021
Merge pull request #6600 from tchak/fix-destroy-groupe-instructeur
fix(grope_instructeur): can not destroy groupe_instructeur with discarded dossiers
2021-11-02 12:22:09 +01:00
Paul Chavard
7ef73f13e4 fix(grope_instructeur): can not destroy groupe_instructeur with discarded dossiers 2021-11-02 12:15:24 +01:00
Paul Chavard
e404529d37
Merge pull request #6601 from tchak/feat-graphql-logs
feat(graphql): add graphql_operation to rails logs
2021-11-02 12:15:09 +01:00
Paul Chavard
3c2515ce6d feat(graphql): add graphql_operation to rails logs 2021-11-02 12:02:00 +01:00
Kara Diaby
5c09cba0af
Merge pull request #6596 from betagouv/fix/6541
ETQ usager, je veux voir les titres des démarches en plus grand dans mon interface
2021-10-29 14:16:52 +02:00
kara Diaby
87ed764f9b enlarge procedure title in user dossier 2021-10-29 14:05:49 +02:00
Paul Chavard
199f128a49
Merge pull request #6594 from tchak/fix-repetition-add-row-button
Fix repetition add row button
2021-10-28 15:03:07 +02:00
Paul Chavard
da49a6447f refactor(repetition): optimize and add a transaction around repetition add row 2021-10-28 14:54:33 +02:00
Paul Chavard
f9a8fb4ada fix(repetition): prevent rage clicks on add row button 2021-10-28 14:54:32 +02:00
Paul Chavard
a8dcf934f8
Merge pull request #6589 from tchak/fix-remove-instructeur-from-group
fix(groupe_instructeur): unfollow dossiers when removed from groupe instructeur
2021-10-28 14:54:14 +02:00
Paul Chavard
c4b93f8d4a fix(groupe_instructeur): unfollow dossiers when removed from groupe instructeur 2021-10-28 14:45:52 +02:00
LeSim
88c2bfed8e
Merge pull request #6585 from betagouv/merge_and_delete
Supprime le vieux compte lors d'un merge
2021-10-28 14:44:47 +02:00
simon lehericey
8fe1e2bf71 wrap merge in transaction 2021-10-28 14:39:13 +02:00
simon lehericey
7935e42109 Add merge log 2021-10-28 14:39:13 +02:00
simon lehericey
3328c9a132 merge move invite as well 2021-10-28 14:39:13 +02:00
simon lehericey
f2ccb39912 merge destroys the old role and account 2021-10-28 14:39:13 +02:00
simon lehericey
1401d163ba add dependent_destroy to user instructeur / admin / expert roles 2021-10-28 14:39:13 +02:00
simon lehericey
c725999582 move merge method to user 2021-10-28 14:39:13 +02:00
simon lehericey
3d524e9488 Change factory user password to be compatible with admin pass constraint 2021-10-28 14:39:13 +02:00
Paul Chavard
aaf1498fff
Merge pull request #6598 from tchak/fix-rebase-champ-repetition
fix(rebase): fix repetition champ rebase
2021-10-28 13:39:11 +02:00
Paul Chavard
1393b7b07b fix(rebase): fix repetition champ rebase 2021-10-28 13:27:53 +02:00
LeSim
a66257884d
Merge pull request #6597 from tchak/fix-typos
fix(typo): addresse -> adresse
2021-10-28 13:04:16 +02:00