diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-04-10 19:10:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 19:10:52 -0400 |
| commit | 6e4e692ee0f7ceb4e33c3711be838701bb65bb6c (patch) | |
| tree | a332585f05e93f0cc328a421bc24a4bf745e451f /actionpack/lib/action_controller/base.rb | |
| parent | 457d2ab97b73d6e59735aa8946d9e7b46ea211f9 (diff) | |
| parent | f22bc41a92e8f51d6f6da5b840f3364474d6aaba (diff) | |
| download | rails-6e4e692ee0f7ceb4e33c3711be838701bb65bb6c.tar.gz rails-6e4e692ee0f7ceb4e33c3711be838701bb65bb6c.tar.bz2 rails-6e4e692ee0f7ceb4e33c3711be838701bb65bb6c.zip | |
Merge pull request #32484 from kddeisz/default-headers
Include default headers by default in API mode
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 204a3d400c..3378d6db0f 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -232,6 +232,7 @@ module ActionController HttpAuthentication::Basic::ControllerMethods, HttpAuthentication::Digest::ControllerMethods, HttpAuthentication::Token::ControllerMethods, + DefaultHeaders, # Before callbacks should also be executed as early as possible, so # also include them at the bottom. @@ -264,12 +265,6 @@ module ActionController PROTECTED_IVARS end - def self.make_response!(request) - ActionDispatch::Response.create.tap do |res| - res.request = request - end - end - ActiveSupport.run_load_hooks(:action_controller_base, self) ActiveSupport.run_load_hooks(:action_controller, self) end |