diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-08-06 11:25:11 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-08-06 11:25:11 -0300 |
| commit | f052e4ae58c7f4dddc6604cde28e224e9b696664 (patch) | |
| tree | 44d36a7bacf73147433345d41f3951c02b3a1fb2 /railties/lib/rails/mailers_controller.rb | |
| parent | 3a4b4559ea7928772e60662036ae4dab88d187c7 (diff) | |
| parent | 35a734d671b023cfe6a3298088bb18e009ad9bd7 (diff) | |
| download | rails-f052e4ae58c7f4dddc6604cde28e224e9b696664.tar.gz rails-f052e4ae58c7f4dddc6604cde28e224e9b696664.tar.bz2 rails-f052e4ae58c7f4dddc6604cde28e224e9b696664.zip | |
Merge pull request #21137 from y-yagi/fix_deprecation_warning
stop using deprecated `render :text` in railties
Diffstat (limited to 'railties/lib/rails/mailers_controller.rb')
| -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 41422a656c..78a857e0f1 100644 --- a/railties/lib/rails/mailers_controller.rb +++ b/railties/lib/rails/mailers_controller.rb @@ -26,7 +26,7 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc: if part = find_part(part_type) response.content_type = part_type - render text: part.respond_to?(:decoded) ? part.decoded : part + render plain: part.respond_to?(:decoded) ? part.decoded : part else raise AbstractController::ActionNotFound, "Email part '#{part_type}' not found in #{@preview.name}##{@email_action}" end |