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

13147 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Chavard
703c436c61
Merge pull request #4313 from maatinito/issue/unable_to_reinvite_admin 
[fix #4311] Unable to reinvite admin
 2019-09-17 16:29:38 +02:00
maatinito
ae34e48624 [fix #4311] Unable to reinvite admin 2019-09-17 16:15:04 +02:00
Paul Chavard
8d1657b218
Merge pull request #4334 from tchak/drop-old-columns-and-tables 
Remove unused columns and tables
 2019-09-17 15:45:01 +02:00
Paul Chavard
8e44172e59 Remove unused columns and tables 2019-09-17 15:39:15 +02:00
Paul Chavard
1105766b26
Merge pull request #4335 from betagouv/fix-procedure-locked-spec 
Fix procedure_locked_spec
 2019-09-17 15:38:53 +02:00
Nicolas Bouilleaud
fc416ee2ec Fix procedure_locked_spec 
`login_as administrateur, scope: :administrateur` doesn’t seem to actually do anything, but testing for the _absence_ of content can’t break.

- Make the test fail if login fails,
- Fix the login,
- Write the opposite test,
- Update the searched content to the actual text used in the partial
 2019-09-17 14:50:37 +02:00
Keirua
0090957ed1
Merge pull request #4321 from Keirua/feat/fix-lien-mon-avis 
Mise à jour de la validation des liens mon avis
 2019-09-17 14:02:48 +02:00
Paul Chavard
9f3c546dc6
Merge pull request #4333 from betagouv/dev 
2019-09-17-01
 2019-09-17 13:44:24 +02:00
clemkeirua
949a0c21e6 gestion des 2 formats de bouton monavis 2019-09-17 13:39:45 +02:00
Paul Chavard
cfb6be94e5
Merge pull request #4327 from tchak/prepare-to-drop-columns 
Prepare to drop columns
 2019-09-17 13:24:42 +02:00
Paul Chavard
ff2b6ca3ea Fix service controller 2019-09-17 12:37:37 +02:00
Paul Chavard
8a691d534a Fix AdministrateurUsageStatisticsService 2019-09-17 12:37:37 +02:00
Paul Chavard
adfa80142a Cleanup application_controller and current_user 2019-09-17 12:37:37 +02:00
Paul Chavard
88842918f9 Prepare to drop columns 2019-09-17 12:37:37 +02:00
LeSim
b32b12afbb
Merge pull request #4328 from tchak/better-logo-include 
Use built in active_storage helper
 2019-09-17 12:00:17 +02:00
Paul Chavard
3eeebd62eb Use built in active_storage helper 2019-09-17 11:11:08 +02:00
Keirua
41c526b811
Merge pull request #4320 from betagouv/perf 
Perf index procedures
 2019-09-17 10:09:15 +02:00
simon lehericey
acb99609ba Move defaut_groupe_instructeur as has_one and eager_load 2019-09-16 15:57:07 +02:00
simon lehericey
afa0237349 remove logo n+1 2019-09-16 15:48:19 +02:00
Nicolas Bouilleaud
5382ec7220
Merge pull request #4318 from betagouv/dev 
2019-09-16-01
 2019-09-16 15:24:22 +02:00
Nicolas Bouilleaud
9770212e1d
Merge pull request #4193 from betagouv/get-rid-of-old-migrations 
Replace old migrations with a single “recreate_structure”
 2019-09-16 15:01:02 +02:00
Nicolas Bouilleaud
661b80777d Replace old migrations with a single “recreate_structure” 
* copy-paste the description from schema.rb,
 * without the `force: :cascade` options (that drops the tables before recreating them).
* create a new migration with it
* give it the same timestamp as the last deleted migration, so that it exists in the schema_migration table and it is not run in production.
* (Also got rid of some stray changes in schema.rb for mon_avis and unconfirmed_email)
* Run rake db:migrate and make sure nothing moves
 2019-09-16 14:44:37 +02:00
Paul Chavard
f2b399df72
Merge pull request #4303 from tchak/tag-champ-repetition 
Serialize champ repetition for tags
 2019-09-12 17:29:14 +02:00
Paul Chavard
b97cbd3402 Serialize champ repetition for tags 
closes #4272
 2019-09-12 17:23:18 +02:00
Paul Chavard
1eac6beb51
Merge pull request #4308 from tchak/select-filter 
Add Style/CollectionMethods to rubocop
 2019-09-12 15:15:06 +02:00
Paul Chavard
3b8d3b7967 Add Style/CollectionMethods to rubocop 2019-09-12 14:48:18 +02:00
Paul Chavard
3f970eee74
Merge pull request #4305 from betagouv/dependabot/bundler/devise-4.7.1 
Bump devise from 4.6.1 to 4.7.1
 2019-09-12 11:50:29 +02:00
dependabot[bot]
683265367d
Bump devise from 4.6.1 to 4.7.1 
Bumps [devise](https://github.com/plataformatec/devise) from 4.6.1 to 4.7.1.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.6.1...v4.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-09-12 09:44:36 +00:00
Paul Chavard
8758caf7f4
Merge pull request #4299 from tchak/fix-flipper-initialize 
Correctly create new flipper flags
 2019-09-12 11:39:40 +02:00
Paul Chavard
d24e0e72a7 Correctly create new flipper flags 2019-09-12 10:46:13 +02:00
LeSim
6126641dc0
Merge pull request #4306 from betagouv/dev 
2019-09-12-01
 2019-09-12 09:57:26 +02:00
Pierre de La Morinerie
49a2308469
Corrige un bug de notifications dans le tableau de bord des ins… (#4304) 
Instructeur : corrige des notifications manquantes dans le tableau de bord
 2019-09-11 21:14:11 +02:00
simon lehericey
82bef0f651 use notifications_per_procedure properly 2019-09-11 20:49:48 +02:00
Pierre de La Morinerie
14ea10b1c7
Merge pull request #4300 from betagouv/fix-helpscout-stats 
Statistiques: correction du taux de contact usager
 2019-09-11 17:38:24 +02:00
Pierre de La Morinerie
503c393a87 helpscout: use replies_sent to compute contact rate 
The `conversations_count` we previously used counts replies, but also
all conversations that were tagged or re-tagged during the month – with
made counting the actual work spent on user support brittle.

Counting the replies is a better estimation of what we get.

Unfortunately this also removes the filtering-by-tag feature. To
mitigate this, the reports are now scoped to a specific mailbox. This
allows to create extra mailboxes for conversations that should't be
counted in the stats.
 2019-09-11 17:26:10 +02:00
Paul Chavard
52226804d0
Merge pull request #4297 from tchak/cleanup-flipflop 
Cleanup FlipFlop
 2019-09-11 11:48:20 +02:00
Paul Chavard
c370c2f475 Cleanup FlipFlop 2019-09-10 23:52:44 +02:00
Pierre de La Morinerie
c8eecaec42
Tentative de correction des tests qui deadlock (#4294) 
Tentative de correction des tests d'acceptance qui deadlock
 2019-09-10 16:57:02 +02:00
Pierre de La Morinerie
d94a5cee8e spec: during js specs, cleanup database using deletion 
This attempts to solve the database deadlock on cleanup by fiddling
with the settings.

Ref #4293
 2019-09-10 16:40:02 +02:00
Pierre de La Morinerie
f99a80147e
Bump mixin-deep from 1.3.1 to 1.3.2 (#4295) 
Bump mixin-deep de 1.3.1 à 1.3.2
 2019-09-10 16:39:29 +02:00
Pierre de La Morinerie
b7f7e32590
2019-09-10-02 (#4296) 
2019-09-10-02
 2019-09-10 16:32:00 +02:00
dependabot[bot]
675eb46e9d
Bump mixin-deep from 1.3.1 to 1.3.2 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-09-10 14:22:37 +00:00
Pierre de La Morinerie
e4e4c5da11
Merge pull request #4261 from tchak/flipper 
Migration des feature-flags de FlipFlop à Flipper
 2019-09-10 16:21:20 +02:00
Paul Chavard
65e227c44b Migrate to flipper 2019-09-10 16:10:14 +02:00
Pierre de La Morinerie
28d869e818
#4269 - Inclure les pièces jointes des blocs répétables dans le… (#4274) 
Instructeur : les pièces jointes des blocs répétables sont maintenant incluses dans l'archive complète du dossier
 2019-09-10 16:04:47 +02:00
clemkeirua
feb9c32537 search attachments inside bloc repetables 2019-09-10 15:30:44 +02:00
Pierre de La Morinerie
b6e5c0bde7
2019-09-10-01 (#4291) 
2019-09-10-01
 2019-09-10 15:21:09 +02:00
Paul Chavard
cce84a4209
Merge pull request #4289 from tchak/fix-template-render-with-empty-files 
Redirect to pdf attachement old name if not attached
 2019-09-10 15:13:19 +02:00
Paul Chavard
347f03d2a9 Redirect to pdf attachement old name if not attached 2019-09-10 15:06:47 +02:00
Pierre de La Morinerie
0201a501c6
Rename “Passé en construction le” to 'Déposé le' for clarity (#4248) 
Instructeur : dans l'export tableur, la colonne « Passé en construction le » est renommée en « Déposé le »
 2019-09-10 15:04:03 +02:00