diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-11-15 01:18:09 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-11-15 11:29:31 -0200 |
| commit | 5f00f137246752fc34b1fdc416e6de975401337f (patch) | |
| tree | 81a288c5697007cf5cb92efa701684c89739e4cd /actionpack | |
| parent | ce06d57e390c03cf5438410efc8345c60d961e05 (diff) | |
| download | rails-5f00f137246752fc34b1fdc416e6de975401337f.tar.gz rails-5f00f137246752fc34b1fdc416e6de975401337f.tar.bz2 rails-5f00f137246752fc34b1fdc416e6de975401337f.zip | |
Set values instead of building hashes with single values for merging
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index f4140f21f5..7c2bec32dc 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -168,7 +168,7 @@ module ActionDispatch 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 @@ module ActionDispatch 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 |