1 files changed, 20 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index b9ae8dd5ea..4214399b6f 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -1,3 +1,6 @@
+require 'active_support/deprecation'
+require 'active_support/core_ext/string/filters'
+
 module ActionController
   module Rendering
     extend ActiveSupport::Concern
@@ -53,13 +56,13 @@ module ActionController
       nil
     end
 
-    def _process_format(format, options = {})
-      super
+    def _set_html_content_type
+      self.content_type = Mime::HTML.to_s
+    end
 
-      if options[:plain]
-        self.content_type = Mime::TEXT
-      else
-        self.content_type ||= format.to_s
+    def _set_rendered_content_type(format)
+      unless response.content_type
+        self.content_type = format.to_s
       end
     end
 
@@ -74,6 +77,17 @@ 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/plain`.
+        WARNING
+      end
+
       if options[:html]
         options[:html] = ERB::Util.html_escape(options[:html])
       end