Merge pull request #19215 from gsamokovarov/revert-ruby-2-2-0-kwarg-crash-workarounds

Revert work arounds for upstream Ruby 2.2.0 kwargs bug

2 files changed, 2 insertions, 4 deletions

diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 5fe544c60c..a895d1ab18 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -113,9 +113,7 @@ module ActionDispatch # :nodoc:
     # The underlying body, as a streamable object.
     attr_reader :stream
 
-    # Ruby 2.2 bug https://bugs.ruby-lang.org/issues/10685 prevents
-    # default_headers from being a keyword argument.
-    def initialize(status = 200, header = {}, body = [], default_headers = self.class.default_headers)
+    def initialize(status = 200, header = {}, body = [], default_headers: self.class.default_headers)
       super()
 
       header = merge_default_headers(header, default_headers)
diff --git a/actionpack/lib/action_dispatch/testing/test_response.rb b/actionpack/lib/action_dispatch/testing/test_response.rb
index 527784885c..a9b88ac5fd 100644
--- a/actionpack/lib/action_dispatch/testing/test_response.rb
+++ b/actionpack/lib/action_dispatch/testing/test_response.rb
@@ -7,7 +7,7 @@ module ActionDispatch
   # See Response for more information on controller response objects.
   class TestResponse < Response
     def self.from_response(response)
-      new response.status, response.headers, response.body, nil
+      new response.status, response.headers, response.body, default_headers: nil
     end
 
     # Was the response successful?