Permalink
Browse files

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

  • Loading branch information...
1 parent f38e2e0 commit 0045f37681acdb8fe844fb8118e93cfe9d73140d Carlhuda committed Mar 8, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -85,7 +85,7 @@ def conditions
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

0 comments on commit 0045f37

Please sign in to comment.