diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-06 15:38:05 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-06 15:38:05 -0700 |
| commit | 4c4fd1a60ff1c060e76e9ee540074756510f53ea (patch) | |
| tree | 77da1c66c127e36c8b00825b676d9267a9ef4cd6 /activesupport/lib/active_support/callbacks.rb | |
| parent | 03cb74b9461293b96ae0add8ff5efda132dabba0 (diff) | |
| parent | af130575249571464ec984efa84fcea1267e8cf8 (diff) | |
| download | rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.tar.gz rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.tar.bz2 rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activesupport/lib/active_support/callbacks.rb')
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index b230bb8a40..c669630e47 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -1,7 +1,7 @@ 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/core_ext/object/singleton_class' +require 'active_support/core_ext/kernel/singleton_class' module ActiveSupport # Callbacks are hooks into the lifecycle of an object that allow you to trigger logic |