aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-17 08:56:50 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-17 10:04:39 -0200
commitcb650a50bfc561dc00dfc844dac01beeab05bd00 (patch)
tree8be9c376e2d580202b0db8da544c6e10a6f3ff5a /actionpack/lib/action_controller
parent67c96ab024f008ad1aee8345c1ae0fd7aa9bf072 (diff)
downloadrails-cb650a50bfc561dc00dfc844dac01beeab05bd00.tar.gz
rails-cb650a50bfc561dc00dfc844dac01beeab05bd00.tar.bz2
rails-cb650a50bfc561dc00dfc844dac01beeab05bd00.zip
Remove deprecated default_charset= from AC::Base
This should be set globally as a configuration, using `config.action_dispatch.default_charset` instead
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 813b6501d1..0f43bc8cce 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -4,10 +4,6 @@ module ActionController
# Temporary hax
included do
- class << self
- delegate :default_charset=, :to => "ActionDispatch::Response"
- end
-
self.protected_instance_variables = [
:@_status, :@_headers, :@_params, :@_env, :@_response, :@_request,
:@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout