From a2022f4a2e4bda90ca89981f4af851a3068343d0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 4 Oct 2019 21:05:57 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/environments/development.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config/environments') diff --git a/config/environments/development.rb b/config/environments/development.rb index 3881f1be152..2939e13ef94 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -11,9 +11,6 @@ Rails.application.configure do config.consider_all_requests_local = true config.action_controller.perform_caching = false - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false - # Print deprecation notices to the Rails logger config.active_support.deprecation = :log @@ -38,6 +35,8 @@ Rails.application.configure do config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } # Open sent mails in browser config.action_mailer.delivery_method = :letter_opener_web + # Log mail delivery errors + config.action_mailer.raise_delivery_errors = true # Don't make a mess when bootstrapping a development environment config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1') config.action_mailer.preview_path = 'app/mailers/previews' -- cgit v1.2.3