aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorRolf Timmermans <r.timmermans@voormedia.com>2011-03-12 14:24:36 +0100
committerXavier Noria <fxn@hashref.com>2011-03-12 14:30:09 +0100
commit63c8ea9a6a28ecaabb236dae094d99d9d1ee2ecd (patch)
tree1eb978b6c7cea52c166c9327ef4a5dda438ebd6e /activesupport/lib
parentacd4bfb53764cfea0feaa367cfc8d00dbf9a87c3 (diff)
downloadrails-63c8ea9a6a28ecaabb236dae094d99d9d1ee2ecd.tar.gz
rails-63c8ea9a6a28ecaabb236dae094d99d9d1ee2ecd.tar.bz2
rails-63c8ea9a6a28ecaabb236dae094d99d9d1ee2ecd.zip
adds a couple of missing AS dependencies
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/callbacks.rb1
-rw-r--r--activesupport/lib/active_support/core_ext/module/deprecation.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index b531a094cf..a7a7836f03 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -1,3 +1,4 @@
+require 'active_support/concern'
require 'active_support/descendants_tracker'
require 'active_support/core_ext/array/wrap'
require 'active_support/core_ext/class/attribute'
diff --git a/activesupport/lib/active_support/core_ext/module/deprecation.rb b/activesupport/lib/active_support/core_ext/module/deprecation.rb
index 5a5b4e3f80..9c169a2598 100644
--- a/activesupport/lib/active_support/core_ext/module/deprecation.rb
+++ b/activesupport/lib/active_support/core_ext/module/deprecation.rb
@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
class Module
# Declare that a method has been deprecated.
# deprecate :foo