Permalink
Browse files

Set values instead of building hashes with single values for merging

  • Loading branch information...
1 parent ce06d57 commit 5f00f137246752fc34b1fdc416e6de975401337f @carlosantoniodasilva carlosantoniodasilva committed Nov 15, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -168,7 +168,7 @@ def normalize_defaults!
end
def normalize_conditions!
- @conditions.merge!(:path_info => path)
+ @conditions[:path_info] = path
constraints.each do |key, condition|
unless segment_keys.include?(key) || key == :controller
@@ -196,7 +196,7 @@ def normalize_conditions!
if via = options[:via]
list = Array(via).map { |m| m.to_s.dasherize.upcase }
- @conditions.merge!(:request_method => list)
+ @conditions[:request_method] = list
end
end

0 comments on commit 5f00f13

Please sign in to comment.