aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJulian Nadeau <julian@jnadeau.ca>2017-03-13 17:37:22 -0400
committerJulian Nadeau <julian@jnadeau.ca>2017-04-10 19:34:48 -0400
commit35fac87123df4fdf7cc26b7ccd724932d946be87 (patch)
tree0004150c8bb65898c19e02afe36403ad82f4c5ee /actionpack/lib
parentc134a17b3d740ab1578cdd8da8aba3909910feb2 (diff)
downloadrails-35fac87123df4fdf7cc26b7ccd724932d946be87.tar.gz
rails-35fac87123df4fdf7cc26b7ccd724932d946be87.tar.bz2
rails-35fac87123df4fdf7cc26b7ccd724932d946be87.zip
Add action_controller_api, action_controller_base on_load hook
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/api.rb1
-rw-r--r--actionpack/lib/action_controller/base.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb
index 0d1af0d0bd..94698df730 100644
--- a/actionpack/lib/action_controller/api.rb
+++ b/actionpack/lib/action_controller/api.rb
@@ -141,6 +141,7 @@ module ActionController
include mod
end
+ ActiveSupport.run_load_hooks(:action_controller_api, self)
ActiveSupport.run_load_hooks(:action_controller, self)
end
end
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index b420e00c78..8c2b111f89 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -267,6 +267,7 @@ module ActionController
end
end
+ ActiveSupport.run_load_hooks(:action_controller_base, self)
ActiveSupport.run_load_hooks(:action_controller, self)
end
end