diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-04-23 13:37:19 -0500 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-04-23 13:37:19 -0500 |
| commit | 32cdc032c30dad13931b6ce800d740a72872dabd (patch) | |
| tree | 1364e6e39857cc7459d60af1bdcfbe765fb32437 /activerecord/lib | |
| parent | e20114006ac086241c886203fa0087567c8fef79 (diff) | |
| parent | 4866399054c9facf11bc743c0e0969e6c81f6c31 (diff) | |
| download | rails-32cdc032c30dad13931b6ce800d740a72872dabd.tar.gz rails-32cdc032c30dad13931b6ce800d740a72872dabd.tar.bz2 rails-32cdc032c30dad13931b6ce800d740a72872dabd.zip | |
Merge pull request #14842 from lucasmazza/lm-no-touching-callbacks
Move `NoTouching` down the inheritance chain on AR::Base
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 1d47cba234..db4d5f0129 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -296,7 +296,6 @@ module ActiveRecord #:nodoc: include Core include Persistence - include NoTouching include ReadonlyAttributes include ModelSchema include Inheritance @@ -318,6 +317,7 @@ module ActiveRecord #:nodoc: include NestedAttributes include Aggregations include Transactions + include NoTouching include Reflection include Serialization include Store |