From a9c0eb439263a10937918a32b19d23478245d7f8 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Thu, 31 Jul 2014 09:43:02 -0300
Subject: Avoid a new hash object

---
 actionpack/lib/action_controller/metal/url_for.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 07265be3fe..dc742ce466 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -28,7 +28,7 @@ module ActionController
         :port => request.optional_port,
         :protocol => request.protocol,
         :_recall => request.path_parameters
-      }.merge(super).freeze
+      }.merge!(super).freeze
 
       if (same_origin = _routes.equal?(env["action_dispatch.routes".freeze])) ||
          (script_name = env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]) ||
-- 
cgit v1.2.3