diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-04-11 18:24:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-11 18:24:31 -0400 |
commit | afb41fbefa509cea1259eafb28a0b7825688464b (patch) | |
tree | 30e749d820912aa06b6ec8dbc62191b6c769cb8f /actionpack/lib/action_controller/api.rb | |
parent | fff414ede72ee2dcb39a67aefb4ee6e5c2fd1db0 (diff) | |
parent | 8ca42638bc3115e5161b084a668e253dee94fd24 (diff) | |
download | rails-afb41fbefa509cea1259eafb28a0b7825688464b.tar.gz rails-afb41fbefa509cea1259eafb28a0b7825688464b.tar.bz2 rails-afb41fbefa509cea1259eafb28a0b7825688464b.zip |
Merge pull request #28402 from jules2689/action-controller-api-base-hooks
Add `action_controller_base` and `action_controller_api` hooks to mitigate differences between them. Also document Active Support on_load hooks
Diffstat (limited to 'actionpack/lib/action_controller/api.rb')
-rw-r--r-- | actionpack/lib/action_controller/api.rb | 1 |
1 files changed, 1 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 |