Commit 7b2bead4 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'chore/enable-action-mailer-delivery-errors-in-development' into 'master'

chore: enable logging of mail delivery errors in development

See merge request gitlab-org/gitlab!18021
parents 23d800f3 a6ecb170
...@@ -11,9 +11,6 @@ Rails.application.configure do ...@@ -11,9 +11,6 @@ Rails.application.configure do
config.consider_all_requests_local = true config.consider_all_requests_local = true
config.action_controller.perform_caching = false 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 # Print deprecation notices to the Rails logger
config.active_support.deprecation = :log config.active_support.deprecation = :log
...@@ -38,6 +35,8 @@ Rails.application.configure do ...@@ -38,6 +35,8 @@ Rails.application.configure do
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
# Open sent mails in browser # Open sent mails in browser
config.action_mailer.delivery_method = :letter_opener_web 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 # Don't make a mess when bootstrapping a development environment
config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1') config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1')
config.action_mailer.preview_path = 'app/mailers/previews' config.action_mailer.preview_path = 'app/mailers/previews'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment