aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-05-21 09:49:38 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-10-10 00:02:52 -0300
commit79a5ea9eadb4d43b62afacedc0706cbe88c54496 (patch)
tree0f4cd12777911bff6f3019c1707ac1ec558e2c46 /actionpack/lib/action_controller/metal
parent57e1c99a280bdc1b324936a690350320a1cd8111 (diff)
downloadrails-79a5ea9eadb4d43b62afacedc0706cbe88c54496.tar.gz
rails-79a5ea9eadb4d43b62afacedc0706cbe88c54496.tar.bz2
rails-79a5ea9eadb4d43b62afacedc0706cbe88c54496.zip
Remove deprecated support to :text in render
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index e068f60b1e..67365a143e 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -4,7 +4,7 @@ module ActionController
module Rendering
extend ActiveSupport::Concern
- RENDER_FORMATS_IN_PRIORITY = [:body, :text, :plain, :html]
+ RENDER_FORMATS_IN_PRIORITY = [:body, :plain, :html]
module ClassMethods
# Documentation at ActionController::Renderer#render
@@ -83,17 +83,6 @@ module ActionController
def _normalize_options(options) #:nodoc:
_normalize_text(options)
- if options[:text]
- ActiveSupport::Deprecation.warn <<-WARNING.squish
- `render :text` is deprecated because it does not actually render a
- `text/plain` response. Switch to `render plain: 'plain text'` to
- render as `text/plain`, `render html: '<strong>HTML</strong>'` to
- render as `text/html`, or `render body: 'raw'` to match the deprecated
- behavior and render with the default Content-Type, which is
- `text/html`.
- WARNING
- end
-
if options[:html]
options[:html] = ERB::Util.html_escape(options[:html])
end