diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-03-20 11:52:55 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-20 11:52:55 -0400 |
commit | d36991147863a95bea93506dc5411d00043790f5 (patch) | |
tree | 1236f5f1e3b2177b116a606f3b8ecfbdf21c6aee /railties | |
parent | c11d115fa3c58ec6bde5e9799673cee381d22d47 (diff) | |
parent | 0756733d75cd4b9e115cc43f457c7f2731c25e1c (diff) | |
download | rails-d36991147863a95bea93506dc5411d00043790f5.tar.gz rails-d36991147863a95bea93506dc5411d00043790f5.tar.bz2 rails-d36991147863a95bea93506dc5411d00043790f5.zip |
Merge pull request #35661 from jhawthorn/lookup_context_validation
Validate types assigned to LookupContext#formats=
Diffstat (limited to 'railties')
-rw-r--r-- | railties/lib/rails/mailers_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/mailers_controller.rb b/railties/lib/rails/mailers_controller.rb index 95dae3ec2d..5cffa52860 100644 --- a/railties/lib/rails/mailers_controller.rb +++ b/railties/lib/rails/mailers_controller.rb @@ -38,7 +38,7 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc: end else @part = find_preferred_part(request.format, Mime[:html], Mime[:text]) - render action: "email", layout: false, formats: %w[html] + render action: "email", layout: false, formats: [:html] end else raise AbstractController::ActionNotFound, "Email '#{@email_action}' not found in #{@preview.name}" |