diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-08-15 13:32:52 -0700 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-08-15 13:32:52 -0700 |
commit | bb4e790dff3b345b4080263eb0b17da172b6e67f (patch) | |
tree | f246c84d919781a6074cc002983e9c1f29cd2e39 | |
parent | fd29b4e47f498ac259c8d3c3fcfaa61c99f2972a (diff) | |
parent | 83eec4ca4c8312e27678c15f87ba2e17532f7f07 (diff) | |
download | rails-bb4e790dff3b345b4080263eb0b17da172b6e67f.tar.gz rails-bb4e790dff3b345b4080263eb0b17da172b6e67f.tar.bz2 rails-bb4e790dff3b345b4080263eb0b17da172b6e67f.zip |
Merge pull request #2539 from arunagw/delegate_expl
Delegate expl
-rw-r--r-- | activesupport/lib/active_support/notifications.rb | 2 | ||||
-rw-r--r-- | activesupport/test/notifications_test.rb | 1 | ||||
-rw-r--r-- | railties/lib/rails/railtie.rb | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb index 77696eb1db..b5a70d5933 100644 --- a/activesupport/lib/active_support/notifications.rb +++ b/activesupport/lib/active_support/notifications.rb @@ -1,5 +1,3 @@ -require 'active_support/core_ext/module/delegation' - module ActiveSupport # Notifications provides an instrumentation API for Ruby. To instrument an # action in Ruby you just need to do: diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb index cc0dc564f7..884ee61547 100644 --- a/activesupport/test/notifications_test.rb +++ b/activesupport/test/notifications_test.rb @@ -1,4 +1,5 @@ require 'abstract_unit' +require 'active_support/core_ext/module/delegation' module Notifications class TestCase < ActiveSupport::TestCase diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb index 8c88b25617..e8fb1f3d98 100644 --- a/railties/lib/rails/railtie.rb +++ b/railties/lib/rails/railtie.rb @@ -2,6 +2,7 @@ require 'rails/initializable' require 'rails/configuration' require 'active_support/inflector' require 'active_support/core_ext/module/introspection' +require 'active_support/core_ext/module/delegation' module Rails # Railtie is the core of the Rails framework and provides several hooks to extend |