diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 16:57:47 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 16:57:47 -0600 |
| commit | 5c32f41d5258743500345db34839a21139676f8e (patch) | |
| tree | be9d7d97069165f2f9a3a72e56195599efd03a09 /activerecord/test/models/project.rb | |
| parent | d94ae72a5259c31ea510e6341bbbf4e920312ebe (diff) | |
| parent | df94dabb374de5a109de0756c4c19b18375cd5af (diff) | |
| download | rails-5c32f41d5258743500345db34839a21139676f8e.tar.gz rails-5c32f41d5258743500345db34839a21139676f8e.tar.bz2 rails-5c32f41d5258743500345db34839a21139676f8e.zip | |
Fix merge conflicts for #19938
This is a separate commit, as it is not just a changelog conflict. Want
to point out the changes in the code
Diffstat (limited to 'activerecord/test/models/project.rb')
| -rw-r--r-- | activerecord/test/models/project.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/models/project.rb b/activerecord/test/models/project.rb index 5328330653..b034e0e267 100644 --- a/activerecord/test/models/project.rb +++ b/activerecord/test/models/project.rb @@ -1,4 +1,5 @@ class Project < ActiveRecord::Base + belongs_to :mentor has_and_belongs_to_many :developers, -> { distinct.order 'developers.name desc, developers.id desc' } has_and_belongs_to_many :readonly_developers, -> { readonly }, :class_name => "Developer" has_and_belongs_to_many :non_unique_developers, -> { order 'developers.name desc, developers.id desc' }, :class_name => 'Developer' |