diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2015-07-17 17:17:34 -0400 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2015-07-17 17:17:34 -0400 |
| commit | 4129196fd455b64f4e93060ccf6fdda27e9403f3 (patch) | |
| tree | 78e241f52d2c7d495181594f3aa990085422585b /activesupport/lib | |
| parent | 89448a7f5c21729568eaa12250447f313197a30d (diff) | |
| parent | 800d5ae36c8a906e6fb26d4064a6a75236f84186 (diff) | |
| download | rails-4129196fd455b64f4e93060ccf6fdda27e9403f3.tar.gz rails-4129196fd455b64f4e93060ccf6fdda27e9403f3.tar.bz2 rails-4129196fd455b64f4e93060ccf6fdda27e9403f3.zip | |
Merge pull request #20125
Manually merged to fix conflicts.
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/hash_with_indifferent_access.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb index 63690a1342..c5d35b84f0 100644 --- a/activesupport/lib/active_support/hash_with_indifferent_access.rb +++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb @@ -238,10 +238,12 @@ module ActiveSupport def to_options!; self end def select(*args, &block) + return to_enum(:select) unless block_given? dup.tap { |hash| hash.select!(*args, &block) } end def reject(*args, &block) + return to_enum(:reject) unless block_given? dup.tap { |hash| hash.reject!(*args, &block) } end |