diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-07-11 16:35:36 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:09 +0200 |
| commit | b9b48c780649c40dbec0758e2ff3e9f14b2bf3f3 (patch) | |
| tree | 9b583206c9b7fd0ba6e0aeb0c3ac9620e8acb497 | |
| parent | 49608f7b81314fea0487311f57b41b721c375339 (diff) | |
| download | rails-b9b48c780649c40dbec0758e2ff3e9f14b2bf3f3.tar.gz rails-b9b48c780649c40dbec0758e2ff3e9f14b2bf3f3.tar.bz2 rails-b9b48c780649c40dbec0758e2ff3e9f14b2bf3f3.zip | |
Remove abstract_controller load hooks
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/railtie.rb | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index 8949a9fc78..af5de815bb 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -163,8 +163,6 @@ module AbstractController method_for_action(action_name).present? end - ActiveSupport.run_load_hooks(:abstract_controller, self) - private # Returns true if the name can be considered an action because diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index d349af3748..e94f71ae74 100644 --- a/actionview/lib/action_view/railtie.rb +++ b/actionview/lib/action_view/railtie.rb @@ -40,10 +40,6 @@ module ActionView ActiveSupport.on_load(:action_controller) do ActionController::Base.send(:include, ActionView::Layouts) end - - ActiveSupport.on_load(:abstract_controller) do - AbstractController::Base.send(:include, ActionView::Rendering) - end end end end |