diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-27 18:21:29 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-27 19:25:14 -0300 |
| commit | f4d818d51e64a025f78fca15fdae2391ed072656 (patch) | |
| tree | 67fc2a0868bb4fc2c333fae88fffae340661681d /activerecord/lib/active_record/model.rb | |
| parent | c01810dbec7dc4112c0f8b9bd78709c6db9a3e2d (diff) | |
| download | rails-f4d818d51e64a025f78fca15fdae2391ed072656.tar.gz rails-f4d818d51e64a025f78fca15fdae2391ed072656.tar.bz2 rails-f4d818d51e64a025f78fca15fdae2391ed072656.zip | |
Revert "Removing composed_of from ActiveRecord."
This reverts commit 14fc8b34521f8354a17e50cd11fa3f809e423592.
Reason: we need to discuss a better path from this removal.
Conflicts:
activerecord/lib/active_record/reflection.rb
activerecord/test/cases/base_test.rb
activerecord/test/models/developer.rb
Diffstat (limited to 'activerecord/lib/active_record/model.rb')
| -rw-r--r-- | activerecord/lib/active_record/model.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/model.rb b/activerecord/lib/active_record/model.rb index fb3fb643ff..03f6d36ddb 100644 --- a/activerecord/lib/active_record/model.rb +++ b/activerecord/lib/active_record/model.rb @@ -89,6 +89,7 @@ module ActiveRecord include ActiveModel::SecurePassword include AutosaveAssociation include NestedAttributes + include Aggregations include Transactions include Reflection include Serialization |