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

10619 commits

This branch
This branch
All branches
Author SHA1 Message Date
Keirua
0f88409f4a
Merge pull request #4710 from betagouv/4703-fix-menu-deroulant-liee 
#4703 - fix menu déroulant lié obligatoire
 2020-01-28 14:35:50 +01:00
clemkeirua
696e39761f deal with secondary_options that can be nil 2020-01-28 14:30:26 +01:00
clemkeirua
65b4bcf3a1 Permet de déposer un dossier lorsqu'un menu déroulant lié obligatoire n'a pas de valeur (car la liste est légitimement vide) dans le second champ. 2020-01-28 14:30:26 +01:00
Paul Chavard
81fd91ce41
Merge pull request #4619 from tchak/add-canonical-procedure 
Register canonical procedure when démarche republished under existing path
 2020-01-28 13:00:06 +01:00
Paul Chavard
67dea1ee50 Update spec/models/procedure_spec.rb 
Co-Authored-By: Pierre de La Morinerie <kemenaran@gmail.com>
 2020-01-28 12:49:53 +01:00
Paul Chavard
517ab25783 Register canonical procedure when demarche republished under existing path 2020-01-28 12:49:53 +01:00
Paul Chavard
04ad829e3f Add canonical_procedure_id to procedures 2020-01-28 12:49:53 +01:00
Paul Chavard
4a600a5514
Merge pull request #4715 from tchak/update-rspec 
Update rspec
 2020-01-28 12:49:12 +01:00
Paul Chavard
12c02a602f Update rspec 2020-01-28 12:43:07 +01:00
Paul Chavard
926b092d05
Merge pull request #4714 from betagouv/add-exercice-spec 
specs: add an actual test case to the Exercice spec
 2020-01-28 12:34:43 +01:00
Pierre de La Morinerie
aaaf6f393b specs: add an actual test case to the Exercice spec 
This fixes the "No timing found for 'spec/models/exercice_spec.rb'"
warning message during specs.
 2020-01-28 12:00:34 +01:00
Paul Chavard
a8c71f851e
Merge pull request #4711 from betagouv/fix-circleci-yarn-cache 
Improve CircleCI caches
 2020-01-28 11:00:01 +01:00
Keirua
c17ae662fb
Merge pull request #4712 from betagouv/dev 
2020-01-28-01
 2020-01-28 08:54:49 +01:00
Pierre de La Morinerie
9a18f40720 ci: increase the change of cache hits 
See https://circleci.com/docs/2.0/caching/#restoring-cache
 2020-01-27 18:12:29 +01:00
Pierre de La Morinerie
bd1a2caad9 ci: save webpacker cache 2020-01-27 17:58:09 +01:00
Pierre de La Morinerie
9e7371d19a ci: don't allow yarn to update the lockfile during CI builds 
Yarn will now throw an error if there's a mismatch between the
package.json and the package.lock content.
 2020-01-27 17:38:01 +01:00
Pierre de La Morinerie
0ce1919cfb ci: save yarn cache after installing it 2020-01-27 17:26:17 +01:00
Pierre de La Morinerie
5755bdc836
Bug circleci not dispatching tests according previous time to r… (#4706) 
Bug circleci not dispatching tests according previous time to run them
 2020-01-27 17:19:11 +01:00
maatinito
b767f0a7f7 Bug circleci not dispatching tests according previous time to run them 
(store_test_results requires a directory)
 2020-01-27 17:12:09 +01:00
Keirua
e6fdf0d89e
Merge pull request #4709 from betagouv/4698-autocomplete-inclure-pas-resultats 
#4698 - Possibilite de selectionner un resultat quand il n'y a rien de suggéré dans le champ adresse
 2020-01-27 16:53:53 +01:00
Keirua
455f164d02
Detail the reason why we include the search term in the results 
Co-Authored-By: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr>
 2020-01-27 16:47:32 +01:00
clemkeirua
9e858ae5ad possibilite de selectionner un resultat quand il n'y a rien dans le champ adresse 2020-01-27 12:51:06 +01:00
Keirua
feee73c7d8
Merge pull request #4707 from betagouv/dev 
2020-01-27-01
 2020-01-27 09:16:40 +01:00
Paul Chavard
35aceeb5e6
Merge pull request #4699 from tchak/search-by-code 
Search departements by code
 2020-01-23 20:43:19 +00:00
Paul Chavard
f03cca4386 Search departements by code 2020-01-23 14:12:19 +00:00
Pierre de La Morinerie
f9377a6594
2020-01-21-01 (#4696) 
2020-01-21-01
 2020-01-21 19:16:25 +01:00
Pierre de La Morinerie
032731c3e8
Revert "4127 fix superadmin supprime compte usager" (#4695) 
Revert "4127 fix superadmin supprime compte usager"
 2020-01-21 19:10:12 +01:00
Pierre de La Morinerie
751f24f7bb
Revert "4127 fix superadmin supprime compte usager" 2020-01-21 18:57:54 +01:00
Pierre de La Morinerie
65a78b682f
Refactor dossiers factories (#4675) 
Refactor dossiers factories
 2020-01-21 18:42:31 +01:00
Pierre de La Morinerie
792ba73643 factories: ensure that dossiers with_entreprise are consistent 2020-01-21 17:24:56 +01:00
Pierre de La Morinerie
0efb62f03a factories: ensure that dossiers with_individual are consistent 2020-01-21 17:24:56 +01:00
Pierre de La Morinerie
724ff50363 factories: rename dossier for_individual to with_individual 
This clarifies the distinction between

```
create :procedure, :for_individual
```

and

```
create :dossier, :with_individual
```
 2020-01-21 17:24:56 +01:00
Pierre de La Morinerie
00e5b736fb factories: mark the parent procedure as for_individual 
This ensures that we don't get an inconsistency, where a dossier is
`for_individual` while its procedure is not `for_individual`.
 2020-01-21 17:24:56 +01:00
Pierre de La Morinerie
6a47458112 specs: use order-insentitive matching for arrays 
The specs sometime failes locally, because the order of the returned
objects is undefined.

This is an acceptable behavior – but it means we should test for
collection membership, rather than for a specific array order.

Replace `match` by `match_array` to have unordered matching.
 2020-01-21 17:24:56 +01:00
Keirua
c891543bd9
Merge pull request #4694 from betagouv/strike-banner-wording 
app: improve wording of the strike banner
 2020-01-21 17:14:25 +01:00
Pierre de La Morinerie
a63c3dbfc4
app: improve wording of the strike banner 
Make it clearer that the strike affects only the DS staff.
 2020-01-21 16:49:55 +01:00
Keirua
293e7b087a
Merge pull request #4693 from betagouv/dev 
2020-01-21-01
 2020-01-21 16:04:26 +01:00
Keirua
840efad4ea
Merge pull request #4688 from betagouv/4127-fix-superadmin-supprime-compte-usager 
4127 fix superadmin supprime compte usager
 2020-01-21 15:43:58 +01:00
Christophe Robillard
88e73d4039 raise exception if problem with destroy 2020-01-21 15:05:33 +01:00
Christophe Robillard
675bbdad15 transfere les services lors de suppression admin 
Lorsqu'un administrateur est supprimé, ses services sont transférés à un
autre administrateur pour chacune de ses procédures
 2020-01-21 15:05:33 +01:00
Christophe Robillard
d9570eedc6 empêche suppression d'un user qui est instructeur 2020-01-21 15:05:33 +01:00
Christophe Robillard
a6d007dbd3 supprime un instructeur 2020-01-21 15:05:33 +01:00
Christophe Robillard
d4de5769ee empêche la suppression d'un user qui est admin 2020-01-21 15:05:33 +01:00
Christophe Robillard
d8a51f986f supprime un utilisateur qui a des dossiers cachés 2020-01-21 15:05:33 +01:00
Keirua
3f20925d66
Merge pull request #4677 from betagouv/feat/delete-groups 
#4601 - Suppression des groupes instructeurs
 2020-01-20 16:28:46 +01:00
clemkeirua
fb87a87f47 code review changes 2020-01-20 16:15:02 +01:00
clemkeirua
499f93aed3 ajout d'un test pour l'ecran de reaffectation des dossiers 2020-01-20 16:15:02 +01:00
clemkeirua
4e8ecb048c ajout d'un test pour la suppression des groupes 2020-01-20 16:15:02 +01:00
clemkeirua
794e95e6eb fix total count of groupe_instructeur 2020-01-20 16:15:02 +01:00
clemkeirua
12430a8068 ajout d'un écran intermediaire pour gérer la reaffectation des dossiers 2020-01-20 16:15:02 +01:00