From 48cce9d39985c834bdd44bfb09ba3c8172ca5a2d Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 13 May 2014 11:01:53 -0700 Subject: just merge instead of dup and merge --- actionpack/lib/action_dispatch/routing/route_set.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 845ccb5f94..351079acc0 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -171,8 +171,7 @@ module ActionDispatch def call(t, args) if args.size == arg_size && !args.last.is_a?(Hash) && optimize_routes_generation?(t) - options = @options.dup - options.merge!(t.url_options) + options = @options.merge t.url_options options[:path] = optimized_helper(args) ActionDispatch::Http::URL.url_for(options) else -- cgit v1.2.3