aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/base.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index ea7d336640..082f09ff16 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1218,6 +1218,11 @@ module ActionController #:nodoc:
@action_name = (params['action'] || 'index')
end
+ def assign_default_content_type_and_charset
+ response.assign_default_content_type_and_charset!
+ end
+ deprecate :assign_default_content_type_and_charset => :'response.assign_default_content_type_and_charset!'
+
def action_methods
self.class.action_methods
end