diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-27 15:07:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-27 15:07:00 -0300 |
| commit | 4a049583a24a5803f75d2ad27d683f4b138f17e2 (patch) | |
| tree | 0a53251185ea67207e7c4859be7cc3d9e951b428 /actionpack | |
| parent | 75aa573c8b72febe9f1ba9c9b227b597a55a78a3 (diff) | |
| parent | cdaab2c479c819b04cc72a97c52b804832365cef (diff) | |
| download | rails-4a049583a24a5803f75d2ad27d683f4b138f17e2.tar.gz rails-4a049583a24a5803f75d2ad27d683f4b138f17e2.tar.bz2 rails-4a049583a24a5803f75d2ad27d683f4b138f17e2.zip | |
Merge pull request #19113 from vipulnsward/remove-requires
Removed non-standard and unused require 'active_support/deprecation'
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/callbacks.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb index 681caba457..59ffb0a19e 100644 --- a/actionpack/lib/abstract_controller/callbacks.rb +++ b/actionpack/lib/abstract_controller/callbacks.rb @@ -1,5 +1,3 @@ -require 'active_support/deprecation' - module AbstractController module Callbacks extend ActiveSupport::Concern diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index 01bbd749c1..f19c4201ba 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -1,7 +1,6 @@ require 'active_support/core_ext/hash/indifferent_access' require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/string/filters' -require 'active_support/deprecation' require 'active_support/rescuable' require 'action_dispatch/http/upload' require 'stringio' |