diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/deprecated_redirects.rb | 17 | ||||
| -rw-r--r-- | actionpack/test/controller/action_pack_assertions_test.rb | 2 |
4 files changed, 2 insertions, 20 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 642525a939..54b5ca40c6 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,6 +1,6 @@ *SVN* -* Deprecation: remove deprecated instance variables. [Jeremy Kemper] +* Deprecation: remove deprecated instance variables and redirect methods. [Jeremy Kemper] * Consistent public/protected/private visibility for chained methods. #7813 [Dan Manges] diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 4fb8542382..58aff0922a 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -37,7 +37,6 @@ end $:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/html-scanner" require 'action_controller/base' -require 'action_controller/deprecated_redirects' require 'action_controller/request' require 'action_controller/deprecated_request_methods' require 'action_controller/rescue' diff --git a/actionpack/lib/action_controller/deprecated_redirects.rb b/actionpack/lib/action_controller/deprecated_redirects.rb deleted file mode 100644 index 3e18aeab40..0000000000 --- a/actionpack/lib/action_controller/deprecated_redirects.rb +++ /dev/null @@ -1,17 +0,0 @@ -module ActionController - class Base - protected - # Deprecated in favor of calling redirect_to directly with the path. - def redirect_to_path(path) #:nodoc: - redirect_to(path) - end - - # Deprecated in favor of calling redirect_to directly with the url. If the resource has moved permanently, it's possible to pass - # true as the second parameter and the browser will get "301 Moved Permanently" instead of "302 Found". This can also be done through - # just setting the headers["Status"] to "301 Moved Permanently" before using the redirect_to. - def redirect_to_url(url, permanently = false) #:nodoc: - headers["Status"] = "301 Moved Permanently" if permanently - redirect_to(url) - end - end -end diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index 4e79117c7b..e4624484ec 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -24,7 +24,7 @@ class ActionPackAssertionsController < ActionController::Base def redirect_to_named_route() redirect_to route_one_url end # a redirect to an external location - def redirect_external() redirect_to_url "http://www.rubyonrails.org"; end + def redirect_external() redirect_to "http://www.rubyonrails.org"; end # a 404 def response404() head '404 AWOL' end |