aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-14 18:11:38 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-17 10:04:37 -0200
commitbc50cb31d6b1064463b371cf428e7eb6fcbf2fd3 (patch)
treeb4c64f9454c6cf00963fda0bed0cd30ddb16707d /actionpack/lib/action_controller
parent4280b20cde6d0ec4694f25288832d098c83cceba (diff)
downloadrails-bc50cb31d6b1064463b371cf428e7eb6fcbf2fd3.tar.gz
rails-bc50cb31d6b1064463b371cf428e7eb6fcbf2fd3.tar.bz2
rails-bc50cb31d6b1064463b371cf428e7eb6fcbf2fd3.zip
Remove old compatibility methods not being used
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb4
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb4
2 files changed, 2 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index b6d441d544..f570a7565c 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -116,7 +116,7 @@ module ActionController
#
# Title: <%= @post.title %>
#
- # You don't have to rely on the automated rendering. For example, actions that could result in the rendering of different templates
+ # You don't have to rely on the automated rendering. For example, actions that could result in the rendering of different templates
# will use the manual rendering methods:
#
# def search
@@ -133,7 +133,7 @@ module ActionController
# == Redirects
#
# Redirects are used to move from one action to another. For example, after a <tt>create</tt> action, which stores a blog entry to the
- # database, we might like to show the user the new entry. Because we're following good DRY principles (Don't Repeat Yourself), we're
+ # database, we might like to show the user the new entry. Because we're following good DRY principles (Don't Repeat Yourself), we're
# going to reuse (and redirect to) a <tt>show</tt> action that we'll assume has already been created. The code might look like this:
#
# def create
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 43719d5808..a2d06bab95 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -28,10 +28,6 @@ module ActionController
end
end
- # For old tests
- def initialize_template_class(*) end
- def assign_shortcuts(*) end
-
def _normalize_options(options)
options[:text] = nil if options.delete(:nothing) == true
options[:text] = " " if options.key?(:text) && options[:text].nil?