Merge branch 'master' into adequaterecord

* master:
  Fix eager load of Serializers on Active Model
  Consistence in the block style
  Remove warnings on Ruby 2.1
  Only some dynamic finders are deprecated.
  clean up security guide: his => their [ci skip]
  Remove warning
  Extract a method to simplify setup code
  Use minitest's skip rather than conditionals + early returns
  Move AR test classes inside the test case
  Do not set up a variable used only in two tests
  No need for instance vars on single tests
  Cleanup duplicated setup of callbacks in transactions tests
  No need to use #send with public methods
  Update deprecation warning to give more information about caller
  Update changelog
  Avoid scanning multiple render calls as a single match.
  Improve ERB dependency detection.

2 files changed, 11 insertions, 3 deletions

diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb
index f690eab604..594a4ca938 100644
--- a/activesupport/lib/active_support/hash_with_indifferent_access.rb
+++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -159,7 +159,7 @@ module ActiveSupport
     #
     #   counters.fetch('foo')          # => 1
     #   counters.fetch(:bar, 0)        # => 0
-    #   counters.fetch(:bar) {|key| 0} # => 0
+    #   counters.fetch(:bar) { |key| 0 } # => 0
     #   counters.fetch(:zoo)           # => KeyError: key not found: "zoo"
     def fetch(key, *extras)
       super(convert_key(key), *extras)
@@ -172,7 +172,7 @@ module ActiveSupport
     #   hash[:b] = 'y'
     #   hash.values_at('a', 'b') # => ["x", "y"]
     def values_at(*indices)
-      indices.collect {|key| self[convert_key(key)]}
+      indices.collect { |key| self[convert_key(key)] }
     end
 
     # Returns an exact copy of the hash.
@@ -228,7 +228,11 @@ module ActiveSupport
     def to_options!; self end
 
     def select(*args, &block)
-      dup.tap {|hash| hash.select!(*args, &block)}
+      dup.tap { |hash| hash.select!(*args, &block) }
+    end
+
+    def reject(*args, &block)
+      dup.tap { |hash| hash.reject!(*args, &block) }
     end
 
     # Convert to a regular hash with string keys.
diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index 1a3693f766..58a2ce2105 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -28,6 +28,10 @@ module ActiveSupport
       coder.represent_seq '!omap', map { |k,v| { k => v } }
     end
 
+    def reject(*args, &block)
+      dup.tap { |hash| hash.reject!(*args, &block) }
+    end
+
     def nested_under_indifferent_access
       self
     end