diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-07-17 15:20:45 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-07-17 15:20:45 -0700 |
| commit | d00b635242120f4262178909d93faf4473b1055e (patch) | |
| tree | 8cf8e7908ed9b93d1a8786396a8d59c993558e87 /activerecord/lib | |
| parent | d8745decaf59aad32aa2f09abdba99b8d0e48b31 (diff) | |
| parent | 80f61259f927e5e37e7f7b0ce0da44da1dc84efe (diff) | |
| download | rails-d00b635242120f4262178909d93faf4473b1055e.tar.gz rails-d00b635242120f4262178909d93faf4473b1055e.tar.bz2 rails-d00b635242120f4262178909d93faf4473b1055e.zip | |
Merge pull request #7081 from jfirebaugh/to_param_regression_master
AR::Integration must be included after AM::Conversion
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/model.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/model.rb b/activerecord/lib/active_record/model.rb index 0015e3a567..fb3fb643ff 100644 --- a/activerecord/lib/active_record/model.rb +++ b/activerecord/lib/active_record/model.rb @@ -74,9 +74,9 @@ module ActiveRecord include Inheritance include Scoping include Sanitization - include Integration include AttributeAssignment include ActiveModel::Conversion + include Integration include Validations include CounterCache include Locking::Optimistic |