diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-28 18:21:03 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-28 18:25:35 -0700 |
| commit | acd5db300b755d5abae2748f239441fb865c6b62 (patch) | |
| tree | 075910d5994ca1e0abd3f9b02016bf612a174609 /railties/lib/rails | |
| parent | b825bef74cdde2a29ee050a5ddf4034633abcfe0 (diff) | |
| download | rails-acd5db300b755d5abae2748f239441fb865c6b62.tar.gz rails-acd5db300b755d5abae2748f239441fb865c6b62.tar.bz2 rails-acd5db300b755d5abae2748f239441fb865c6b62.zip | |
Rejig active support dependencies to behave better with the boot process
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/backtrace_cleaner.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails/plugin.rb | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/railties/lib/rails/backtrace_cleaner.rb b/railties/lib/rails/backtrace_cleaner.rb index 923ed8b31d..1605429e8b 100644 --- a/railties/lib/rails/backtrace_cleaner.rb +++ b/railties/lib/rails/backtrace_cleaner.rb @@ -1,3 +1,6 @@ +require 'active_support/backtrace_cleaner' +require 'rails/gem_dependency' + module Rails class BacktraceCleaner < ActiveSupport::BacktraceCleaner ERB_METHOD_SIG = /:in `_run_erb_.*/ diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb index bc28bec57e..0f924724cd 100644 --- a/railties/lib/rails/plugin.rb +++ b/railties/lib/rails/plugin.rb @@ -1,8 +1,3 @@ -require 'active_support' -require 'active_support/core_ext/kernel/reporting' -require 'active_support/core_ext/symbol' -require 'active_support/dependencies' - module Rails # The Plugin class should be an object which provides the following methods: # |