kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

rack-mount 0.5 support

This commit is contained in:
Joshua Peek 2010-02-15 11:16:56 -06:00
parent 546e319a5f
commit 3cecc44cb9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/actionpack.gemspec
View File

@ -21,6 +21,6 @@ Gem::Specification.new do |s|
s.add_dependency('activemodel', '= 3.0.0.beta1')
s.add_dependency('rack', '~> 1.1.0')
s.add_dependency('rack-test', '~> 0.5.0')
s.add_dependency('rack-mount', '~> 0.4.7')
s.add_dependency('rack-mount', '~> 0.5.1')
s.add_dependency('erubis', '~> 2.6.5')
end

2
actionpack/lib/action_dispatch/routing/route_set.rb
View File

@ -431,7 +431,7 @@ module ActionDispatch
end
req = Rack::Request.new(env)
@set.recognize(req) do |route, params|
@set.recognize(req) do |route, matches, params|
dispatcher = route.app
if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params)
dispatcher.prepare_params!(params)