diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-04-22 17:21:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 17:21:41 -0400 |
| commit | cc834db1d0815744cfa173813c05d928e008e167 (patch) | |
| tree | b49b6f204fb3f2f4cb612ba7fd77e8f1ff39ff83 /actionpack | |
| parent | 216ef01d149e379478b67f517d7b970055339085 (diff) | |
| parent | b62b038d9aa3593fb2be94a5e187c4f531e67834 (diff) | |
| download | rails-cc834db1d0815744cfa173813c05d928e008e167.tar.gz rails-cc834db1d0815744cfa173813c05d928e008e167.tar.bz2 rails-cc834db1d0815744cfa173813c05d928e008e167.zip | |
Merge pull request #36058 from rails/revert-36038-fix-35602
Revert "Include Caching module for ActionController::API"
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/api.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb index 02ab3bf570..c276ee57c0 100644 --- a/actionpack/lib/action_controller/api.rb +++ b/actionpack/lib/action_controller/api.rb @@ -117,7 +117,6 @@ module ActionController ApiRendering, Renderers::All, ConditionalGet, - Caching, BasicImplicitRender, StrongParameters, |