Merge branch 'develop' into staging

app/models/mail_template.rb

@@ -37,8 +37,8 @@ class MailTemplate < ActiveRecord::Base
       when :numero_dossier
         dossier.id.to_s
       when :lien_dossier
-        TPS::Application::URL # quickfix
-        # link_to users_dossier_recapitulatif_url(dossier), users_dossier_recapitulatif_url(dossier), target: '_blank'
+        # TPS::Application::URL # quickfix
+        link_to users_dossier_recapitulatif_url(dossier), users_dossier_recapitulatif_url(dossier), target: '_blank'
       when :libelle_procedure
         dossier.procedure.libelle
       else

config/environments/development.rb

@@ -42,25 +42,18 @@ Rails.application.configure do
   # Action Mailer settings
   config.action_mailer.delivery_method = :smtp
   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 = {
     host: 'localhost:3000',
     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
   # config.action_view.raise_on_missing_translations = true