diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-09-03 14:58:46 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-09-03 14:58:46 +0200 |
| commit | d35cf4b6a0645dffb508ae1a5ad10924f7026f0f (patch) | |
| tree | 063480b44be65481c9f288449428b1722295f2b2 | |
| parent | aea02eb43001d85def0e69dce76fde0757040089 (diff) | |
| download | rails-d35cf4b6a0645dffb508ae1a5ad10924f7026f0f.tar.gz rails-d35cf4b6a0645dffb508ae1a5ad10924f7026f0f.tar.bz2 rails-d35cf4b6a0645dffb508ae1a5ad10924f7026f0f.zip | |
Make Mime::TEXT default format in AbstractController
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 4 |
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." |