aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-05-12 06:48:04 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-05-12 06:48:04 -0700
commit85662c0b91e0b3c0caef72eb978c615776048282 (patch)
treea51102ad95bda80e8c75462cc75ecb49b1df9533
parent987f79cda890d37fd5c3da8a64dac5c797956291 (diff)
parent3d03c7982982fd7dda45df9d1973f2696860088b (diff)
downloadrails-85662c0b91e0b3c0caef72eb978c615776048282.tar.gz
rails-85662c0b91e0b3c0caef72eb978c615776048282.tar.bz2
rails-85662c0b91e0b3c0caef72eb978c615776048282.zip
Merge pull request #527 from joshk/deprecation_circular_dependency
Remove a circular require in AS deprecations.
-rw-r--r--activesupport/lib/active_support/core_ext/module/deprecation.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/module/deprecation.rb b/activesupport/lib/active_support/core_ext/module/deprecation.rb
index 9c169a2598..5a5b4e3f80 100644
--- a/activesupport/lib/active_support/core_ext/module/deprecation.rb
+++ b/activesupport/lib/active_support/core_ext/module/deprecation.rb
@@ -1,5 +1,3 @@
-require 'active_support/deprecation'
-
class Module
# Declare that a method has been deprecated.
# deprecate :foo