diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-12-01 23:00:47 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-12-01 23:00:47 +0530 |
| commit | 0181c2da977fc3de4e4c4eac602b26ff180cda2c (patch) | |
| tree | 4ff327e807bc7729c5b99bf261bdbc5178faf227 /activesupport/lib/active_support | |
| parent | fb42520252477d83560f2e2a2550c7f377e07bc1 (diff) | |
| parent | 9685019c4a15eb0222984748e7413dc5920195f4 (diff) | |
| download | rails-0181c2da977fc3de4e4c4eac602b26ff180cda2c.tar.gz rails-0181c2da977fc3de4e4c4eac602b26ff180cda2c.tar.bz2 rails-0181c2da977fc3de4e4c4eac602b26ff180cda2c.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/active_record_validations.md
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/deprecation/instance_delegator.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/deprecation/instance_delegator.rb b/activesupport/lib/active_support/deprecation/instance_delegator.rb index ff240cb887..8472a58add 100644 --- a/activesupport/lib/active_support/deprecation/instance_delegator.rb +++ b/activesupport/lib/active_support/deprecation/instance_delegator.rb @@ -3,13 +3,13 @@ require 'active_support/core_ext/module/delegation' module ActiveSupport class Deprecation - module InstanceDelegator + module InstanceDelegator # :nodoc: def self.included(base) base.extend(ClassMethods) base.public_class_method :new end - module ClassMethods + module ClassMethods # :nodoc: def include(included_module) included_module.instance_methods.each { |m| method_added(m) } super @@ -21,4 +21,4 @@ module ActiveSupport end end end -end
\ No newline at end of file +end |