aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-10-14 14:48:43 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-10-14 14:48:43 -0700
commit3fa7e2fc98235fdb6abba1d0e703464e880aa2af (patch)
tree25e97ee903f2791683c69c679ef9b7b356eb1dfd /activesupport
parent3e62503903bec17f418a1c4e28d3cf119a520458 (diff)
downloadrails-3fa7e2fc98235fdb6abba1d0e703464e880aa2af.tar.gz
rails-3fa7e2fc98235fdb6abba1d0e703464e880aa2af.tar.bz2
rails-3fa7e2fc98235fdb6abba1d0e703464e880aa2af.zip
Revert "Missing requires"
These rely on constant autoloads. This reverts commit d39f397dc6726b27cc2c60a6e24e15cb1944ec58.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/callbacks.rb1
-rw-r--r--activesupport/lib/active_support/testing/setup_and_teardown.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 0856e4f568..67e9b0103f 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -1,7 +1,6 @@
require 'active_support/core_ext/array/wrap'
require 'active_support/core_ext/class/inheritable_attributes'
require 'active_support/core_ext/kernel/reporting'
-require 'active_support/concern'
module ActiveSupport
# Callbacks are hooks into the lifecycle of an object that allow you to trigger logic
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 137e2629ff..b738ef334c 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -1,4 +1,3 @@
-require 'active_support/callbacks'
module ActiveSupport
module Testing
module SetupAndTeardown