Commit ee43d3a6 authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'action_mailer-default_url_options-based-on-config' into 'master'

Remove `action_mailer.default_url_options` override in development

See merge request gitlab-org/gitlab!72817
parents 18ecd88a 1216d3fa
...@@ -42,8 +42,6 @@ Rails.application.configure do ...@@ -42,8 +42,6 @@ Rails.application.configure do
# Raises helpful error messages. # Raises helpful error messages.
config.assets.raise_runtime_errors = true config.assets.raise_runtime_errors = true
# For having correct urls in mails
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 # Log mail delivery errors
......
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