Pierre de La Morinerie
522e5fa76b
Merge pull request #6626 from betagouv/main
2021-11-11 08:21:57 +01:00
Paul Chavard
71939c650b
fix(export): remove wrong columns from repetition spreadsheets
...
This fix prevent repetition children types de champ from being pulled from cloned procedures. stable_id is stable across revisions but also across cloned procedures.
2021-11-10 20:45:32 +01:00
Pierre de La Morinerie
f5fc5022a6
Merge pull request #6625 from betagouv/fix-flaky-test-for-real
2021-11-10 08:42:36 +01:00
Pierre de La Morinerie
9dd7806ae5
specs: add two missing fields to the brouillon spec
2021-11-09 15:22:20 +01:00
Pierre de La Morinerie
5dbb9f9e3c
specs: fix flaky "dossier brouillon" spec
...
The previous fix (scrolling to the viewport) didn't actually worked,
because the code tried to scroll the checkbox itself.
2021-11-09 15:21:59 +01:00
Pierre de La Morinerie
23f56577ee
Merge pull request #6623 from pengfeidong/fix_6622_clean_dossier_table_css
...
Amélioration de l'affichage du tableau des dossiers supprimés (#6623 )
2021-11-09 12:50:02 +01:00
Peng-Fei DONG
dc560479ec
clean css in page deleted_dossiers for show the dossier table
2021-11-09 12:45:41 +01:00
Pierre de La Morinerie
ad083aec70
Merge pull request #6606 from betagouv/faster-ci
...
Accélération du temps des tests sur la CI
2021-11-09 11:06:44 +01:00
Pierre de La Morinerie
75e207122b
ci: use previous test timings to split the tests
2021-11-09 08:32:31 +01:00
Pierre de La Morinerie
184bf38bb2
ci: split actions into several sub-actions
2021-11-09 08:32:31 +01:00
Pierre de La Morinerie
641f0df712
ci: avoid installing node modules again
...
By default `bin/rails assets:precompile` will run `yarn install` again.
The suggested workaround is to remove `bin/yarn` before running the
task.
See https://github.com/rails/webpacker/issues/405
2021-11-09 08:32:31 +01:00
Pierre de La Morinerie
d0a6fc4b8e
ci: precompile (and cache) assets
...
This avoids the assets to be compiled lazily during the first spec,
which confuses test metrics.
2021-11-09 08:32:31 +01:00
Pierre de La Morinerie
a01a619ec0
js: update caniuse browsers db
...
This follows a warning during tests:
> Browserslist: caniuse-lite is outdated. Please run:
> npx browserslist@latest --update-db
>
> Why you should do it regularly:
> browserslist/browserslist#browsers-data-updating
2021-11-09 08:32:31 +01:00
Pierre de La Morinerie
2c96ade1b2
ci: split tests automatically
2021-11-09 08:32:31 +01:00
Pierre de La Morinerie
ba78e2bfb2
ci: use bin/rails instead of rake
2021-11-09 08:32:31 +01:00
Pierre de La Morinerie
21efece09e
ci: use builtin cache for node modules
...
This is around 20s faster (10s when retrieved the cache and installing
node modules, and 10s when saving the cache).
2021-11-09 08:32:31 +01:00
Pierre de La Morinerie
d83c036ef1
specs: profile specs runtime
2021-11-09 08:32:31 +01:00
LeSim
6ab6031fe0
Merge pull request #6621 from betagouv/fix-typo
...
fix typo
2021-11-08 13:34:59 +01:00
krichtof
954fa12656
fix typo
...
Uniquement des corrections d'orthographe ou de grammaire
2021-11-08 11:10:55 +01:00
Kara Diaby
29f3feaa06
Merge pull request #6620 from betagouv/main
...
2021-11-05-01
2021-11-05 14:28:35 +01:00
Kara Diaby
f29d93097b
Merge pull request #6608 from betagouv/feat/6547
...
FIX PJ - Lancer les jobs d'antivirus et analyse rails indépendamment
2021-11-05 14:09:25 +01:00
kara Diaby
1b27ab5aff
tests
2021-11-05 13:32:21 +01:00
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
LeSim
2e421429e5
Merge pull request #6612 from betagouv/main
...
2021-11-04-01
2021-11-04 10:45:57 +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