diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 17:15:31 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 17:15:31 -0800 |
| commit | 83f4d86a9330533ec9af21ba18b4ab28011b8981 (patch) | |
| tree | a5145f9230797f88eb34c3e28c55ba93a706e1f1 /actionpack/lib/abstract_controller | |
| parent | bdccffc40eee1e11b7e5f3516bffa4c46bf97b30 (diff) | |
| download | rails-83f4d86a9330533ec9af21ba18b4ab28011b8981.tar.gz rails-83f4d86a9330533ec9af21ba18b4ab28011b8981.tar.bz2 rails-83f4d86a9330533ec9af21ba18b4ab28011b8981.zip | |
Rename the RenderingController module to just plain Rendering
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/helpers.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb (renamed from actionpack/lib/abstract_controller/rendering_controller.rb) | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb index d3b492ad09..1d898d1a4c 100644 --- a/actionpack/lib/abstract_controller/helpers.rb +++ b/actionpack/lib/abstract_controller/helpers.rb @@ -4,7 +4,7 @@ module AbstractController module Helpers extend ActiveSupport::Concern - include RenderingController + include Rendering def self.next_serial @helper_serial ||= 0 diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index c71cef42b2..46760bba7c 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -2,7 +2,7 @@ module AbstractController module Layouts extend ActiveSupport::Concern - include RenderingController + include Rendering included do extlib_inheritable_accessor(:_layout_conditions) { Hash.new } diff --git a/actionpack/lib/abstract_controller/rendering_controller.rb b/actionpack/lib/abstract_controller/rendering.rb index 7f2243d4ef..8ef2526df0 100644 --- a/actionpack/lib/abstract_controller/rendering_controller.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -10,7 +10,7 @@ module AbstractController end end - module RenderingController + module Rendering extend ActiveSupport::Concern include AbstractController::Logger @@ -80,7 +80,7 @@ module AbstractController # # :api: plugin def render_to_string(options = {}) - AbstractController::RenderingController.body_to_s(render_to_body(options)) + AbstractController::Rendering.body_to_s(render_to_body(options)) end # Renders the template from an object. |