diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-08 19:14:35 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-08 19:14:35 -0300 |
| commit | 952014315926d370f2a0b681cb765948bf2e6883 (patch) | |
| tree | 3abfe7e82554c09df4b2fe8a170e90cf1f0bcf02 /actionpack/lib/abstract_controller/helpers.rb | |
| parent | ae9e1e9f6d08bbd5f5c1512b72d495168e9fa5e5 (diff) | |
| parent | ed8a0a1c2370ab8715434ba824b2826d807401d5 (diff) | |
| download | rails-952014315926d370f2a0b681cb765948bf2e6883.tar.gz rails-952014315926d370f2a0b681cb765948bf2e6883.tar.bz2 rails-952014315926d370f2a0b681cb765948bf2e6883.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/test/cases/adapter_test.rb
activerecord/test/cases/method_scoping_test.rb
Diffstat (limited to 'actionpack/lib/abstract_controller/helpers.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb index 5efa37fde3..04eaa02441 100644 --- a/actionpack/lib/abstract_controller/helpers.rb +++ b/actionpack/lib/abstract_controller/helpers.rb @@ -2,7 +2,7 @@ module AbstractController module Helpers extend ActiveSupport::Concern - include Renderer + include RenderingController included do extlib_inheritable_accessor(:_helpers) { Module.new } |