diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-03-08 12:30:51 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-03-08 12:30:51 -0800 |
| commit | 0045f37681acdb8fe844fb8118e93cfe9d73140d (patch) | |
| tree | fa023b71e656670625b613d9442ed905b0dfa93d /actionpack/lib/action_dispatch/routing/mapper.rb | |
| parent | f38e2e03351da463f84f6850fa10718ece98ff26 (diff) | |
| download | rails-0045f37681acdb8fe844fb8118e93cfe9d73140d.tar.gz rails-0045f37681acdb8fe844fb8118e93cfe9d73140d.tar.bz2 rails-0045f37681acdb8fe844fb8118e93cfe9d73140d.zip | |
Whoops. We meant to switch from returning to tap, not vice versa
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index e6c563d7b7..dee4516fbe 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -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 |