Paul Chavard
b596956761
Merge pull request #3017 from betagouv/fix-missing-host-in-email-assets
...
config: fix email assets not having the full URL domain prepended
2018-11-21 13:02:48 +01:00
Pierre de La Morinerie
ac9a87f27b
config: fix email assets not having the full URL domain prepended
...
When sending emails, the mailer doesn't have access to the request
host. It needs to infer it by itself.
For this we need two settings:
- action_mailer.default_url_options, to generate urls to routes
- action_mailer.asset_host, to generate full urls to assets
Only the first one of these settings was set in production.
Fix #2518
2018-11-21 12:30:00 +01:00
Pierre de La Morinerie
37af20b236
Merge pull request #3011 from betagouv/fix-mailer-tests
...
mailers: fix dossier mailer spec
2018-11-20 17:51:10 +01:00
Pierre de La Morinerie
f983bc68e2
mailers: fix dossier mailer spec
2018-11-20 17:45:50 +01:00
gregoirenovel
dde43141ef
Merge pull request #3004 from betagouv/fix-new-message-footer
...
Corrige le lien direct vers la messagerie dans l'email "Vous avez un nouveau message"
2018-11-20 14:58:13 +01:00
Pierre de La Morinerie
38b5c77ad3
mailers: use notification layout for 'new answer' email
...
Fix #2224
2018-11-20 14:46:31 +01:00
Pierre de La Morinerie
a5f9be00e0
mailers: add preview URL to all previewable mailers
2018-11-20 14:46:31 +01:00
Pierre de La Morinerie
f2eaf66a9a
mailers: add missing previews for notification emails
2018-11-20 14:46:31 +01:00
Pierre de La Morinerie
e5303fd986
mailers: streamline the NotificationMailer
...
Notifications are now only for demarche-templated emails.
2018-11-20 14:46:31 +01:00
Paul Chavard
1d1a15bf70
Merge pull request #3003 from tchak/fix-instructeurs-list
...
Fix instructeurs list filter
2018-11-20 14:32:30 +01:00
Paul Chavard
7ba9624a3f
Fix instructeurs list filter
...
fix #3002
2018-11-20 14:27:32 +01:00
Paul Chavard
4df346b946
Merge pull request #2930 from tchak/migrate-carto
...
Task to migrate carto to champ carte
2018-11-20 12:35:53 +01:00
Paul Chavard
d43068ace5
Disable carto for new procedures
2018-11-20 12:14:10 +01:00
Paul Chavard
864d1df413
Test carto migration task
2018-11-20 10:58:22 +01:00
Paul Chavard
e374a5c726
Refactor ChampSerializer
2018-11-20 10:53:14 +01:00
Paul Chavard
0b017580c5
Expose migrated legacy carto champs on api
2018-11-20 10:53:14 +01:00
Paul Chavard
fe630847e9
Refactor legacy carto serializer
2018-11-20 10:53:14 +01:00
Paul Chavard
31099b782f
Remove dead code
2018-11-20 10:53:14 +01:00
Paul Chavard
d92364b90b
Add user_geo_area do champ carte
2018-11-20 10:53:14 +01:00
Paul Chavard
971a08c92a
Add expose legacy carto api flag
2018-11-20 10:53:14 +01:00
Paul Chavard
18815e88a3
Rename champ.zones to champ.geo_json
2018-11-20 10:53:14 +01:00
Paul Chavard
2462e42b53
Stop using legacy api carto after migration
2018-11-20 10:53:14 +01:00
Paul Chavard
44ca6a2d02
Task to migrate carto to champ carte
2018-11-20 10:53:14 +01:00
Paul Chavard
e63fd9d573
Add migrated flag to module_api_cartos
2018-11-20 10:53:14 +01:00
Frederic Merizen
90d4d8a393
Merge pull request #3000 from betagouv/frederic/fix_2999-bad_redirect_after_login
...
[#2999 ] Rediriger vers la bonne page apres login
2018-11-16 15:54:01 +01:00
Frederic Merizen
101e8e2588
[ #2999 ] Rediriger vers la bonne page apres login
...
(ne corrige pas le cas ou l'utilisateur est passe par le mail de confirmation)
2018-11-16 15:44:20 +01:00
Frederic Merizen
72d0033f65
Merge pull request #2998 from betagouv/bump-gems
...
Bump gems
2018-11-16 12:21:15 +01:00
gregoirenovel
c55ae79930
Bump test gems
...
- guard (2.14.2 → 2.15.0)
2018-11-16 12:05:22 +01:00
gregoirenovel
f7225b0086
Bump development/test gems
...
- rspec-rails (3.8.0 → 3.8.1)
2018-11-16 12:05:22 +01:00
gregoirenovel
6479de1f6c
Bump development gems
...
- rubocop (0.59.2 → 0.60.0)
2018-11-16 12:05:22 +01:00
gregoirenovel
dcf063f8f8
Bump warden and remove its dependency on the master branch
...
Now that the fix for wardencommunity/warden#147
is present in a proper release
2018-11-16 11:48:36 +01:00
gregoirenovel
7b98bfb025
Bump default gems
...
- active_model_serializers (0.10.7 → 0.10.8)
- groupdate (4.0.2 → 4.1.0)
- rails-i18n (5.1.1 → 5.1.2)
- skylight (3.0.0 → 3.1.1)
- typhoeus (1.3.0 → 1.3.1)
2018-11-16 11:46:38 +01:00
Frederic Merizen
b5487141b7
Merge pull request #2997 from betagouv/frederic/fix_2180-active_storage_openstack
...
MAJ fog-openstack et ajout de activestorage-openstack
2018-11-16 11:37:16 +01:00
Frederic Merizen
e69e459649
[ #2180 ] Add activestorage-openstack
2018-11-16 11:11:40 +01:00
Frederic Merizen
d901cb286b
[ #2180 ] Bump fog-openstack
2018-11-16 11:11:39 +01:00
Frederic Merizen
6da33f2387
[ #2180 ] Drop fog
2018-11-16 11:11:39 +01:00
Frederic Merizen
238c0c707b
[ #2180 ] Bump Carrierwave
2018-11-16 11:11:39 +01:00
gregoirenovel
31b57116ce
Merge pull request #2996 from betagouv/fix_2952_page_erreur_500
...
Fix 2952 page erreur 500
2018-11-15 18:26:54 +01:00
pengfei
233ed306e0
[ fix #2952 ] page erreur 500
2018-11-15 18:13:32 +01:00
Mathieu Magnin
215398b47f
Merge pull request #2965 from pengfeidong/fix_2719_supprimer_filtre_long
...
[fix #2719 ] tronquer les textes dans le filtre, max=50
2018-11-15 15:19:46 +01:00
pengfei
0593299def
tronquer uniquement label et mettre close-icon avant le text
2018-11-15 15:10:41 +01:00
pengfei
89daaedbe4
[ fix #2719 ] tronquer les textes dans le filtre, max=50
2018-11-15 15:10:41 +01:00
Paul Chavard
dc62128ed7
Merge pull request #2968 from tchak/dossier-invite
...
Move dossier invites handler to invites controller
2018-11-14 15:28:31 +01:00
Paul Chavard
2eb61bd6ed
Move dossier invites handler to invites controller
2018-11-14 15:16:49 +01:00
Pierre de La Morinerie
f3a72482a5
Merge pull request #2992 from betagouv/fix-order-dependant-test
...
Fix order dependant test
2018-11-14 14:54:51 +01:00
Pierre de La Morinerie
b6521625e4
procedure_spec: add missing Timecop.return statement
...
Fix order-dependant test.
2018-11-14 14:49:41 +01:00
Pierre de La Morinerie
35613992fe
rspec: by default use the safer bisect runner for bisecting
2018-11-14 14:49:41 +01:00
Pierre de La Morinerie
10e56a30eb
Merge pull request #2991 from betagouv/ci-print-test-files
...
circleci: print files used by the shell command
2018-11-14 14:49:28 +01:00
Pierre de La Morinerie
d0bac997cb
circleci: print files used by the shell command
...
This allow to reproduce failures due to tests order more easily.
2018-11-14 14:40:55 +01:00
Pierre de La Morinerie
bccb86144e
Merge pull request #2990 from betagouv/disable-rails-traces-during-tests
...
spec: fix Mina enabling Rails traces during tests
2018-11-14 14:40:29 +01:00
