diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-05-08 03:54:55 +0100 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-05-08 03:54:55 +0100 |
| commit | aec7456f81985b88d6d604679d754636183b5b3a (patch) | |
| tree | 798fcab8ae0c6e2c8c5a63e1f39308ff4bb5a20c /activerecord/test/models/reference.rb | |
| parent | 1c2b2233c3a7ec76c0a0eddf5b8be45c489be133 (diff) | |
| parent | 70f9558d0e4b8e605576693cbb489caa5cf6a2bc (diff) | |
| download | rails-aec7456f81985b88d6d604679d754636183b5b3a.tar.gz rails-aec7456f81985b88d6d604679d754636183b5b3a.tar.bz2 rails-aec7456f81985b88d6d604679d754636183b5b3a.zip | |
Merge branch 'master' of https://github.com/rails/rails into performance_test
Conflicts:
activesupport/lib/active_support/testing/performance.rb
Diffstat (limited to 'activerecord/test/models/reference.rb')
| -rw-r--r-- | activerecord/test/models/reference.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/activerecord/test/models/reference.rb b/activerecord/test/models/reference.rb index 76c0a1a32e..c5af0b5d5f 100644 --- a/activerecord/test/models/reference.rb +++ b/activerecord/test/models/reference.rb @@ -19,8 +19,5 @@ end class BadReference < ActiveRecord::Base self.table_name = 'references' - - def self.default_scope - where :favourite => false - end + default_scope where(:favourite => false) end |