diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-21 22:15:22 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-21 22:15:22 +0100 |
| commit | d72dd38c13f287d7e2b7515889c10ede436baa69 (patch) | |
| tree | 0b930d8ff33e948f45b3fa5c01a8836769cc6d5f /config/environments | |
| parent | 3a4b5961bea66681ba9c455fcfd3ec497bfaed2f (diff) | |
| parent | 5fef55c11a7ea855e7b43ed274558a0893d0dc16 (diff) | |
Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/development.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 829edcf04..476f3d74c 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -62,7 +62,15 @@ Rails.application.configure do # routes, locales, etc. This feature depends on the listen gem. # config.file_watcher = ActiveSupport::EventedFileUpdateChecker - config.action_mailer.delivery_method = :letter_opener + # If usng a Heroku, Vagrant or generic remote development environment, + # use letter_opener_web, accessible at /letter_opener. + # + # Otherwise, use letter_opener, which launches a browser window to view sent mail. + if (ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV']) + config.action_mailer.delivery_method = :letter_opener_web + else + config.action_mailer.delivery_method = :letter_opener + end config.after_initialize do Bullet.enable = true |