aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb1
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb4
2 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index c74bbafdec..0a4b58de7f 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -50,6 +50,7 @@ module AbstractController
# Return Content-Type of rendered content
# :api: public
def rendered_format
+ Mime::TEXT
end
DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w(
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 21224b9c3b..a853adec23 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -20,10 +20,6 @@ module ActionController
end
end
- def rendered_format
- Mime::TEXT
- end
-
class UnsupportedOperationError < StandardError
def initialize
super "Unsupported render operation. BasicRendering supports only :text and :nothing options. For more, you need to include ActionView."