diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-09-17 16:26:52 +0100 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-09-17 16:26:52 +0100 |
| commit | abc86f18b4df3f981935229b003605b9199e09f7 (patch) | |
| tree | 4a7953451f57c1942fc702066ab64adb1f4c5180 /railties/lib/rails | |
| parent | 90ac9f2e54be07117920f6724f5a3543a07367a9 (diff) | |
| parent | 472358d0307c09e2d20f68cae60ddc46248cad08 (diff) | |
| download | rails-abc86f18b4df3f981935229b003605b9199e09f7.tar.gz rails-abc86f18b4df3f981935229b003605b9199e09f7.tar.bz2 rails-abc86f18b4df3f981935229b003605b9199e09f7.zip | |
Merge pull request #20889 from morgoth/fix-mailer-previews-on-not-local-requests
Fix displaying mailer previews on non local requests.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/mailers_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/mailers_controller.rb b/railties/lib/rails/mailers_controller.rb index 78a857e0f1..ed0ea9dd4d 100644 --- a/railties/lib/rails/mailers_controller.rb +++ b/railties/lib/rails/mailers_controller.rb @@ -3,7 +3,7 @@ require 'rails/application_controller' class Rails::MailersController < Rails::ApplicationController # :nodoc: prepend_view_path ActionDispatch::DebugExceptions::RESCUES_TEMPLATE_PATH - before_action :require_local! + before_action :require_local!, unless: :show_previews? before_action :find_preview, only: :preview def index @@ -41,6 +41,10 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc: end protected + def show_previews? + ActionMailer::Base.show_previews + end + def find_preview candidates = [] params[:path].to_s.scan(%r{/|$}){ candidates << $` } |