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

12973 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pierre de La Morinerie
f34be0fed6
Merge pull request #6247 from betagouv/main 
2021-06-01-01
 2021-06-01 10:53:12 +02:00
Paul Chavard
fefbf93be6
Merge pull request #6242 from tchak/fix-discarded-procedures 
Fix destoying discarded procedures
 2021-05-27 19:12:15 +02:00
Paul Chavard
05380b9520 Fix destoying discarded procedures 2021-05-27 18:48:56 +02:00
Pierre de La Morinerie
99bfdd5c33
Merge pull request #6244 from betagouv/add-missing-i18n-key 
i18n : ajout de traductions manquantes pour le nom du modèle User (#6244)
 2021-05-27 16:17:17 +02:00
Pierre de La Morinerie
fcd5df3c2b i18n: add missing i18n keys for User model 
The key for naming the User model was missing – so the default
localization from devise-i18n was used. Unfortunately devise-i18n lacks
the plural form.

This fixes the manager dashboard displaying "User" instead of "Users".
 2021-05-27 16:08:55 +02:00
Pierre de La Morinerie
defeb76d88
Merge pull request #6241 from betagouv/dependabot/npm_and_yarn/dns-packet-1.3.4 
Mise à jour de dns-packet de la version 1.3.1 à 1.3.4
 2021-05-27 15:15:04 +02:00
dependabot[bot]
3d3156cf91
Bump dns-packet from 1.3.1 to 1.3.4 
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-27 13:05:09 +00:00
Paul Chavard
0e417e7a8a
Merge pull request #6243 from betagouv/upgrade-sentry 2021-05-27 15:03:37 +02:00
Pierre de La Morinerie
895ef98692 gems: upgrade sentry to 4.4.0 2021-05-27 14:33:13 +02:00
Paul Chavard
dac2c3a577
Merge pull request #6240 from adullact/6239_fix_sentry-environment 
#6239 - Fix sentry environment
 2021-05-27 11:22:41 +02:00
François Vantomme
bc6d5aca0e Fix (Sentry): prefer Rails secrets over ENV variables 2021-05-27 11:12:27 +02:00
Jon
2a0a65a90f fix(sentry): specify current environment for sentry config 2021-05-27 11:12:27 +02:00
Pierre de La Morinerie
44ff3401ff
Merge pull request #6231 from betagouv/i18n-selector-test 
i18n : ajout d'un test pour le sélecteur de langues (#6231)
 2021-05-27 11:10:43 +02:00
Pierre de La Morinerie
929a556f9f i18n: add feature spec for changing the language 2021-05-27 11:01:26 +02:00
Paul Chavard
9317530f4b
Merge pull request #6238 from adullact/6237_fix_instructeurs-import-spec 
#6237 - Fix (InstructeursImportService): test fails randomly
 2021-05-27 09:55:15 +02:00
François Vantomme
99086a63be Fix (Instructeur): deal nicely with non-guaranteed elements order in arrays 
Use of one-dimension arrays comparison & `contain_exactly` RSpec matcher
to avoid this behaviour:

Failures:
  1) InstructeursImportService#import when an email is malformed ignores or corrects
     Failure/Error:
       expect(procedure_groupes).to match_array([
         ["Occitanie", ["paul@mccartney.uk", "ringo@starr.uk"]],
         ["défaut", []]
       ])
       expected collection contained:  [["Occitanie", ["paul@mccartney.uk", "ringo@starr.uk"]], ["défaut", []]]
       actual collection contained:    [["Occitanie", ["ringo@starr.uk", "paul@mccartney.uk"]], ["défaut", []]]
       the missing elements were:      [["Occitanie", ["paul@mccartney.uk", "ringo@starr.uk"]]]
       the extra elements were:        [["Occitanie", ["ringo@starr.uk", "paul@mccartney.uk"]]]
     # ./spec/services/instructeurs_import_service_spec.rb:70:in `block (4 levels) in <main>'
 2021-05-27 08:33:52 +02:00
Paul Chavard
f74e4e532e
Merge pull request #6234 from tchak/fix-apostrophes 
Fix apostrophes
 2021-05-26 18:13:53 +02:00
Paul Chavard
9b0dae4cc2 Fix apostrophes ‘ -> ’ 2021-05-26 18:05:14 +02:00
Paul Chavard
bd7bb2d0d2 Fix apostrophes ‘ -> ’ 2021-05-26 15:09:23 +02:00
Paul Chavard
9df24b7168
Merge pull request #6233 from betagouv/main 
2021-05-26-01
 2021-05-26 12:57:53 +02:00
Paul Chavard
6fbf689f20
Merge pull request #6232 from tchak/fix-carto 
Do not crash when properties is nil
 2021-05-26 12:49:23 +02:00
Paul Chavard
4922bc88d6 Do not crash when properties is nil 2021-05-26 12:40:07 +02:00
Paul Chavard
a1b48fa1df
Merge pull request #6230 from tchak/cadastres-descriptions 
Enable add descriptions to cadastres
 2021-05-26 12:00:42 +02:00
Paul Chavard
dfc46a8736 Enable add descriptions to cadastres 2021-05-26 11:27:09 +02:00
Paul Chavard
daa20b0b6d
Merge pull request #6228 from tchak/update-export-query 
Update dossier serialize query to stop using deprecated fileds
 2021-05-26 11:26:29 +02:00
Paul Chavard
18ce027b84 Update dossier serialize query to stop using deprecated fileds 2021-05-26 11:12:06 +02:00
Pierre de La Morinerie
a2a66a6d59
Merge pull request #6209 from betagouv/localize-dropdown-button 
i18n : ajout d’un sélecteur de langue (désactivé par défaut) (#6209)
 2021-05-25 16:24:55 +02:00
lydiasan
2d6ad4f2c1
Merge branch 'main' into localize-dropdown-button 2021-05-25 14:45:52 +02:00
lydiasan
884e52326e
Update app/views/layouts/_locale_dropdown.html.haml 
Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr>
 2021-05-25 13:36:50 +02:00
lydiasan
355616e9a7
Update app/views/layouts/_header.haml 
Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr>
 2021-05-25 13:36:32 +02:00
lydiasan
e85dcf4c58
Update app/controllers/application_controller.rb 
Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr>
 2021-05-25 13:32:26 +02:00
Paul Chavard
d7c7f3f2d7
Merge pull request #5948 from tchak/revisions-and-tags 
Use stable_id when replacing tags
 2021-05-25 13:04:12 +02:00
Paul Chavard
33bc46f7bb
Merge pull request #6227 from betagouv/main 
2021-05-25-01
 2021-05-25 11:44:44 +02:00
Paul Chavard
21ee79669d Better labels in test 2021-05-25 11:43:38 +02:00
Paul Chavard
179bb5a9fe Apply suggestions from code review 
Co-authored-by: Pierre de La Morinerie <kemenaran@gmail.com>
 2021-05-25 11:43:38 +02:00
Paul Chavard
acb277e650 Use stable_id when replacing tags 2021-05-25 11:43:38 +02:00
Kara Diaby
8279418e0a
Merge pull request #6226 from betagouv/feature-avis-privacy 
verify avis privacy
 2021-05-25 11:33:54 +02:00
kara Diaby
4b6196e6f6 verify avis privacy 2021-05-25 11:24:15 +02:00
Pierre de La Morinerie
2b8ae246e6
Merge pull request #6199 from betagouv/cleanup-allowed-tags 
Refactorage de la déclaration des balises HTML autorisées (#6199)
 2021-05-25 11:16:50 +02:00
Pierre de La Morinerie
d93342e1d7 config: cleanup allowed tags after Rails 6.1 migration 2021-05-25 11:06:53 +02:00
Paul Chavard
64232ead4b
Merge pull request #6225 from betagouv/dependabot/npm_and_yarn/browserslist-4.16.6 
Bump browserslist from 4.12.0 to 4.16.6
 2021-05-25 10:20:58 +02:00
lydiasan
71069c0e1b correction de la variable d'environnement 'LOCALIZATION_ENABLED' 2021-05-25 10:05:52 +02:00
dependabot[bot]
84d5c95a0d
Bump browserslist from 4.12.0 to 4.16.6 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.12.0 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.12.0...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-25 07:58:22 +00:00
Paul Chavard
8c8f5c564c
Merge pull request #6152 from tchak/use-cadastre-information-from-layers 
Use cadastre information contained in layers
 2021-05-25 08:56:53 +02:00
Paul Chavard
c5f2faa3d2 add tests for backward compatibility of geo_areas 2021-05-24 11:57:00 +02:00
Paul Chavard
55080706ce Convert geo_areas properties to jsonb 2021-05-24 11:57:00 +02:00
Paul Chavard
1b0cc62fc2 Add cadastres to MapReader 2021-05-24 11:57:00 +02:00
Paul Chavard
2244263b49 Add cadastres to MapEditor 2021-05-24 11:57:00 +02:00
Paul Chavard
19440afebf Improuve mapbox utilis and shared components 2021-05-24 11:57:00 +02:00
Paul Chavard
3b85ade440 Add compatibility cadsatre layer with old API GEO 2021-05-24 11:57:00 +02:00