Merge branch 'develop' into staging
This commit is contained in:
commit
d8eb197609
2 changed files with 9 additions and 16 deletions
|
@ -37,8 +37,8 @@ class MailTemplate < ActiveRecord::Base
|
||||||
when :numero_dossier
|
when :numero_dossier
|
||||||
dossier.id.to_s
|
dossier.id.to_s
|
||||||
when :lien_dossier
|
when :lien_dossier
|
||||||
TPS::Application::URL # quickfix
|
# TPS::Application::URL # quickfix
|
||||||
# link_to users_dossier_recapitulatif_url(dossier), users_dossier_recapitulatif_url(dossier), target: '_blank'
|
link_to users_dossier_recapitulatif_url(dossier), users_dossier_recapitulatif_url(dossier), target: '_blank'
|
||||||
when :libelle_procedure
|
when :libelle_procedure
|
||||||
dossier.procedure.libelle
|
dossier.procedure.libelle
|
||||||
else
|
else
|
||||||
|
|
|
@ -42,25 +42,18 @@ Rails.application.configure do
|
||||||
# Action Mailer settings
|
# Action Mailer settings
|
||||||
config.action_mailer.delivery_method = :smtp
|
config.action_mailer.delivery_method = :smtp
|
||||||
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
|
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
|
||||||
|
# Config for mailcatcher https://mailcatcher.me/
|
||||||
|
config.action_mailer.smtp_settings = {
|
||||||
|
:address => "localhost",
|
||||||
|
:port => 1025,
|
||||||
|
:locale => 'fr'
|
||||||
|
}
|
||||||
|
|
||||||
Rails.application.routes.default_url_options = {
|
Rails.application.routes.default_url_options = {
|
||||||
host: 'localhost:3000',
|
host: 'localhost:3000',
|
||||||
protocol: :http
|
protocol: :http
|
||||||
}
|
}
|
||||||
|
|
||||||
# Config for mailcatcher https://mailcatcher.me/
|
|
||||||
config.action_mailer.smtp_settings = {
|
|
||||||
:address => "localhost",
|
|
||||||
:port => 1025,
|
|
||||||
:locale => 'fr'
|
|
||||||
}
|
|
||||||
|
|
||||||
# Config for mailcatcher https://mailcatcher.me/
|
|
||||||
config.action_mailer.smtp_settings = {
|
|
||||||
:address => "localhost",
|
|
||||||
:port => 1025,
|
|
||||||
:locale => 'fr'
|
|
||||||
}
|
|
||||||
|
|
||||||
# Raises error for missing translations
|
# Raises error for missing translations
|
||||||
# config.action_view.raise_on_missing_translations = true
|
# config.action_view.raise_on_missing_translations = true
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue