aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorOscar Del Ben <info@oscardelben.com>2012-05-01 10:58:31 +0200
committerOscar Del Ben <info@oscardelben.com>2012-05-01 10:58:31 +0200
commit87ac6a2540f504a4ec15bc1ec53bdb7ef6f4599c (patch)
tree47fbd7988c2803647adc4750663d4d7660b8c0df /activesupport/lib
parent2a15598ae859d7ca62755f15bc2efd5036f6bc52 (diff)
parentdda6fa8c9cf26ca2fe6793a32e2663bb85169d5c (diff)
downloadrails-87ac6a2540f504a4ec15bc1ec53bdb7ef6f4599c.tar.gz
rails-87ac6a2540f504a4ec15bc1ec53bdb7ef6f4599c.tar.bz2
rails-87ac6a2540f504a4ec15bc1ec53bdb7ef6f4599c.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/hash/slice.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/slice.rb b/activesupport/lib/active_support/core_ext/hash/slice.rb
index 45181f0e16..cb05dcd320 100644
--- a/activesupport/lib/active_support/core_ext/hash/slice.rb
+++ b/activesupport/lib/active_support/core_ext/hash/slice.rb
@@ -18,7 +18,7 @@ class Hash
end
# Replaces the hash with only the given keys.
- # Returns a hash contained the removed key/value pairs
+ # Returns a hash containing the removed key/value pairs.
# {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d => 4}
def slice!(*keys)
keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)