aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2015-02-27 23:20:09 +0530
committerVipul A M <vipulnsward@gmail.com>2015-02-27 23:20:09 +0530
commitcdaab2c479c819b04cc72a97c52b804832365cef (patch)
tree0c23af6b7d29066a144d5501794d5b02cdf38482 /actionpack
parent6889be526c2c338391d62ff3913af719fff7418d (diff)
downloadrails-cdaab2c479c819b04cc72a97c52b804832365cef.tar.gz
rails-cdaab2c479c819b04cc72a97c52b804832365cef.tar.bz2
rails-cdaab2c479c819b04cc72a97c52b804832365cef.zip
Removed non-standard and unused require 'active_support/deprecation' from parts out of active_support.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/abstract_controller/callbacks.rb2
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb1
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'