diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 17:25:13 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 17:25:13 -0800 |
| commit | 9b41e1e4d8b9d159254dc4ad4bbd3207f1b49eb5 (patch) | |
| tree | 9ce0c5ab63bb41bfb43d408c7558080a3d3334eb /actionpack/lib/action_controller | |
| parent | 83f4d86a9330533ec9af21ba18b4ab28011b8981 (diff) | |
| download | rails-9b41e1e4d8b9d159254dc4ad4bbd3207f1b49eb5.tar.gz rails-9b41e1e4d8b9d159254dc4ad4bbd3207f1b49eb5.tar.bz2 rails-9b41e1e4d8b9d159254dc4ad4bbd3207f1b49eb5.zip | |
Renamed Redirector to Redirecting (its a module, not a class)
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/redirecting.rb (renamed from actionpack/lib/action_controller/metal/redirector.rb) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index ee10584548..ec64cc1a39 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -8,7 +8,7 @@ module ActionController include ActionController::Helpers include ActionController::HideActions include ActionController::UrlFor - include ActionController::Redirector + include ActionController::Redirecting include ActionController::Rendering include ActionController::RenderOptions::All include ActionController::Layouts diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 60b3f9a89b..a1d857d2ce 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -58,7 +58,7 @@ module ActionController # Basic implementations for content_type=, location=, and headers are # provided to reduce the dependency on the RackConvenience module - # in Renderer and Redirector. + # in Rendering and Redirecting. def content_type=(type) headers["Content-Type"] = type.to_s diff --git a/actionpack/lib/action_controller/metal/redirector.rb b/actionpack/lib/action_controller/metal/redirecting.rb index a7bd5ee981..d101f920e3 100644 --- a/actionpack/lib/action_controller/metal/redirector.rb +++ b/actionpack/lib/action_controller/metal/redirecting.rb @@ -7,7 +7,7 @@ module ActionController end end - module Redirector + module Redirecting extend ActiveSupport::Concern include AbstractController::Logger |