diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-19 21:05:37 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-19 21:05:37 +1100 |
| commit | 2107921000f4a186fed36e676d1ac089c8be1f99 (patch) | |
| tree | 42f2188f058f8401d57f0d4c72063689a93e0419 /activerecord/test/models/person.rb | |
| parent | ccb7d9def3c20037c9ed5989d8cae1ed68763f4f (diff) | |
| parent | ed8501ef16fb2f5e4bd4d987740f5e5f62978400 (diff) | |
| download | rails-2107921000f4a186fed36e676d1ac089c8be1f99.tar.gz rails-2107921000f4a186fed36e676d1ac089c8be1f99.tar.bz2 rails-2107921000f4a186fed36e676d1ac089c8be1f99.zip | |
Merge branch 'master' of git://github.com/rails/rails into rails
Diffstat (limited to 'activerecord/test/models/person.rb')
| -rw-r--r-- | activerecord/test/models/person.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb index 57fa6418f1..2a73b1ee01 100644 --- a/activerecord/test/models/person.rb +++ b/activerecord/test/models/person.rb @@ -12,6 +12,6 @@ class Person < ActiveRecord::Base has_many :agents, :class_name => 'Person', :foreign_key => 'primary_contact_id' belongs_to :number1_fan, :class_name => 'Person' - named_scope :males, :conditions => { :gender => 'M' } - named_scope :females, :conditions => { :gender => 'F' } + scope :males, :conditions => { :gender => 'M' } + scope :females, :conditions => { :gender => 'F' } end |