diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-21 22:19:27 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-21 22:19:27 +0100 |
| commit | f036c6440bb82ba627784b32dadc2a3309c7a1b4 (patch) | |
| tree | b62350c87a623caa8cbc693fa70f388ab7447e1f /config | |
| parent | 3a4b5961bea66681ba9c455fcfd3ec497bfaed2f (diff) | |
| parent | e028406db4bba2d2fa924d3777e47b51983dc800 (diff) | |
Merge branch 'ineffyble-master'
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/development.rb | 5 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 829edcf04..3f44d861e 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -62,7 +62,10 @@ 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 using 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. + config.action_mailer.delivery_method = (ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV']) ? :letter_opener_web : :letter_opener config.after_initialize do Bullet.enable = true diff --git a/config/routes.rb b/config/routes.rb index 349ab336a..7b9cda908 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,7 @@ require 'sidekiq/web' Rails.application.routes.draw do + mount LetterOpenerWeb::Engine, at: 'letter_opener' if Rails.env.development? mount ActionCable.server, at: 'cable' authenticate :user, lambda { |u| u.admin? } do |