kara Diaby
9ee9389ba1
add the good retry_on StaleObjectError
2021-11-05 13:32:21 +01:00
kara Diaby
475bf0bd2d
add lock version to blobs
2021-11-04 17:42:43 +01:00
LeSim
6d8b733d57
Merge pull request #6616 from betagouv/dependabot/npm_and_yarn/striptags-3.2.0
...
chore(deps): bump striptags from 3.1.1 to 3.2.0
2021-11-04 16:51:59 +01:00
dependabot[bot]
834df24ff7
chore(deps): bump striptags from 3.1.1 to 3.2.0
...
Bumps [striptags](https://github.com/ericnorris/striptags ) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/ericnorris/striptags/releases )
- [Commits](https://github.com/ericnorris/striptags/compare/v3.1.1...v3.2.0 )
---
updated-dependencies:
- dependency-name: striptags
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-04 15:45:18 +00:00
LeSim
d9c7602b7f
Merge pull request #6615 from betagouv/dependabot/npm_and_yarn/color-string-1.6.0
...
chore(deps): bump color-string from 1.5.3 to 1.6.0
2021-11-04 16:39:52 +01:00
LeSim
75dae426aa
Merge branch 'main' into dependabot/npm_and_yarn/color-string-1.6.0
2021-11-04 16:32:10 +01:00
Paul Chavard
98748d5c01
Merge pull request #6613 from tchak/fix-graphql-logs
...
fix(graphql): add graphql_operation to lograge
2021-11-04 16:25:29 +01:00
Paul Chavard
1adafd22d0
fix(graphql): add graphql_operation to lograge
2021-11-04 16:18:10 +01:00
LeSim
d73702ba3d
Merge pull request #6582 from betagouv/merge_2
...
Permet à un usager de merger son compte (#6550 )
2021-11-04 16:17:28 +01:00
simon lehericey
17d131b3cc
add has_may requested_merge_from
2021-11-04 16:10:09 +01:00
simon lehericey
d1162d7493
add e2e spec
2021-11-04 16:10:09 +01:00
simon lehericey
9041e201e8
one merge at a time
2021-11-04 16:10:09 +01:00
simon lehericey
adfac5fb7b
improve ui
2021-11-04 16:10:09 +01:00
simon lehericey
b160086cc5
update update_email to allow merge
2021-11-04 16:10:09 +01:00
simon lehericey
652b8367be
accept or refuse merge
2021-11-04 16:10:09 +01:00
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