diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 6df755dd9e..40655c6577 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *2.3.0 [Edge]* +* Remove deprecated ActionController::Base#assign_default_content_type_and_charset + * Changed the default of ActionView#render to assume partials instead of files when not given an options hash [DHH]. Examples: # Instead of <%= render :partial => "account" %> diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index bffe6efa15..ad6562024a 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1270,11 +1270,6 @@ 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 |