kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Whoops. We meant to switch from returning to tap, not vice versa

Browse source
This commit is contained in:
Carlhuda 2010-03-08 12:30:51 -08:00
parent f38e2e0335
commit 0045f37681
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_dispatch/routing/mapper.rb
View file

@ -85,7 +85,7 @@ module ActionDispatch
end
def requirements
@requirements ||= returning(@options[:constraints] || {}) do |requirements|
@requirements ||= (@options[:constraints] || {}).tap do |requirements|
requirements.reverse_merge!(@scope[:constraints]) if @scope[:constraints]
@options.each { |k, v| requirements[k] = v if v.is_a?(Regexp) }
end