aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/abstract_controller/base.rb2
-rw-r--r--actionview/lib/action_view/railtie.rb4
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