diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-10 10:41:24 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-10 10:41:24 -0800 |
| commit | 522b72fd28b898c914cfbdbc31837e56702f60d5 (patch) | |
| tree | 4d1322e4a692d3c1c4b4b2519bd80e068c3b6b8b /activesupport/lib/active_support/core_ext/range/overlaps.rb | |
| parent | a9a12700c72353397cf644073e58a3a1c60c30a2 (diff) | |
| parent | 3092324ef4e2f6f096adfbcf92597502b3ce91aa (diff) | |
| download | rails-522b72fd28b898c914cfbdbc31837e56702f60d5.tar.gz rails-522b72fd28b898c914cfbdbc31837e56702f60d5.tar.bz2 rails-522b72fd28b898c914cfbdbc31837e56702f60d5.zip | |
Merge branch 'master' into instance_reader
* master:
Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
make Range#overlaps? accept Range of Time
improved test case for partial indices
Made schema dumper recognize partial indices' where statements
Added where option to add_index to support postgresql partial indices
Diffstat (limited to 'activesupport/lib/active_support/core_ext/range/overlaps.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/range/overlaps.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/range/overlaps.rb b/activesupport/lib/active_support/core_ext/range/overlaps.rb index 7df653b53f..603657c180 100644 --- a/activesupport/lib/active_support/core_ext/range/overlaps.rb +++ b/activesupport/lib/active_support/core_ext/range/overlaps.rb @@ -3,6 +3,6 @@ class Range # (1..5).overlaps?(4..6) # => true # (1..5).overlaps?(7..9) # => false def overlaps?(other) - include?(other.first) || other.include?(first) + cover?(other.first) || other.cover?(first) end end |