summaryrefslogtreecommitdiff
path: root/config/environments/development.rb
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-06-18 09:23:31 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-06-18 09:23:31 +0200
commit56777e89562fe9c81f6e9237bff9cee6420fc093 (patch)
treea18d1dfad849311b38812db98d3f9cad520a49dc /config/environments/development.rb
parent9169c7e81fb906cf9f419d195d73a585b19dafbc (diff)
parent00906b5bb6cde8cb60281109060a519a54000c61 (diff)
downloadgitlab-ce-56777e89562fe9c81f6e9237bff9cee6420fc093.tar.gz
Merge branch 'master' into ci-scala-example
Diffstat (limited to 'config/environments/development.rb')
-rw-r--r--config/environments/development.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 689694a3480..8cca0039b4a 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -36,9 +36,10 @@ Rails.application.configure do
# For having correct urls in mails
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
# Open sent mails in browser
- config.action_mailer.delivery_method = :letter_opener
+ config.action_mailer.delivery_method = :letter_opener_web
# Don't make a mess when bootstrapping a development environment
config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1')
+ config.action_mailer.preview_path = 'spec/mailers/previews'
config.eager_load = false
end