diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-07 15:12:24 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-07 15:12:24 -0300 |
| commit | cf94a551dc56141b2b66521a77b9e20b97395979 (patch) | |
| tree | 76ed30c0894ec09f85526339bc70fdff3c5481d7 /activerecord/lib/active_record/base.rb | |
| parent | 4cf63ce3731a43bd98f7b92b43dcf1be99c0b183 (diff) | |
| parent | 3fab9d8821bc73b28a76f27353cab34d49096ad2 (diff) | |
| download | rails-cf94a551dc56141b2b66521a77b9e20b97395979.tar.gz rails-cf94a551dc56141b2b66521a77b9e20b97395979.tar.bz2 rails-cf94a551dc56141b2b66521a77b9e20b97395979.zip | |
Merge pull request #15558 from sgrif/sg-rename-property
Rename `property` to `attribute`
Conflicts:
activerecord/lib/active_record/attribute_methods/serialization.rb
activerecord/lib/active_record/base.rb
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 8663544231..e8c067f758 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -20,7 +20,7 @@ require 'active_record/errors' require 'active_record/log_subscriber' require 'active_record/explain_subscriber' require 'active_record/relation/delegation' -require 'active_record/properties' +require 'active_record/attributes' module ActiveRecord #:nodoc: # = Active Record @@ -323,7 +323,7 @@ module ActiveRecord #:nodoc: include Reflection include Serialization include Store - include Properties + include Attributes include AttributeDecorators end |