aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-03 13:26:10 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-03 13:26:10 -0700
commita593fc1ee19bf365ba715f8b5e74eb6f74011eda (patch)
tree7bfb5a7501d8cff303bb7b3c9589db9e5539d69d
parent3974b95a6e04c9ff59cf647f9064829b6b6fe69e (diff)
parent419f257b739a837fa1c56c2c7ee4e25a8025cfec (diff)
downloadrails-a593fc1ee19bf365ba715f8b5e74eb6f74011eda.tar.gz
rails-a593fc1ee19bf365ba715f8b5e74eb6f74011eda.tar.bz2
rails-a593fc1ee19bf365ba715f8b5e74eb6f74011eda.zip
Merge pull request #11281 from jetthoughts/remove_unused_deprecation_requires
Removed unused deprecation requires.
-rw-r--r--railties/lib/rails.rb1
-rw-r--r--railties/lib/rails/configuration.rb1
-rw-r--r--railties/lib/rails/generators/active_model.rb2
-rw-r--r--railties/lib/rails/test_unit/testing.rake1
4 files changed, 0 insertions, 5 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 3a3c11d8b3..ea82327365 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -10,7 +10,6 @@ require 'active_support/core_ext/array/extract_options'
require 'rails/application'
require 'rails/version'
-require 'rails/deprecation'
require 'active_support/railtie'
require 'action_dispatch/railtie'
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 15d13d5f28..c694513960 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
require 'active_support/ordered_options'
require 'active_support/core_ext/object'
require 'rails/paths'
diff --git a/railties/lib/rails/generators/active_model.rb b/railties/lib/rails/generators/active_model.rb
index b6f8687d49..6183944bb0 100644
--- a/railties/lib/rails/generators/active_model.rb
+++ b/railties/lib/rails/generators/active_model.rb
@@ -1,5 +1,3 @@
-require 'active_support/deprecation'
-
module Rails
module Generators
# ActiveModel is a class to be implemented by each ORM to allow Rails to
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index e35eccc2eb..3aa33d1bba 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -1,7 +1,6 @@
require 'rbconfig'
require 'rake/testtask'
require 'rails/test_unit/sub_test_task'
-require 'active_support/deprecation'
task default: :test