DGNum/demarches-normaliennes
11
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Xavier J 2016-09-01 11:00:19 +02:00
commit c64a4ef61f
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/notification_mailer/dossier_received.html.erb Normal file
View file

@ -0,0 +1 @@
<%= (MailTemplate.replace_tags @dossier.procedure.mail_received.body, @dossier).html_safe %>

1
app/views/notification_mailer/dossier_received.text.erb
View file

@ -1 +0,0 @@
<%= MailTemplate.replace_tags @dossier.procedure.mail_received.body, @dossier %>

4
config/environments/development.rb
View file

@ -37,10 +37,10 @@ Rails.application.configure do
config.assets.raise_runtime_errors = true
config.action_mailer.delivery_method = :test
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
end