From 3fa7e2fc98235fdb6abba1d0e703464e880aa2af Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 14 Oct 2009 14:48:43 -0700 Subject: Revert "Missing requires" These rely on constant autoloads. This reverts commit d39f397dc6726b27cc2c60a6e24e15cb1944ec58. --- activesupport/lib/active_support/callbacks.rb | 1 - activesupport/lib/active_support/testing/setup_and_teardown.rb | 1 - 2 files changed, 2 deletions(-) (limited to 'activesupport') 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 -- cgit v1.2.3