diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-02 15:21:19 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-02 15:21:19 -0700 |
| commit | 186fee48c796b104b76ef69decb32ef396f435db (patch) | |
| tree | 9f8b8c8c83af7bd2913c1283f51fd3c3492fea82 /actionpack/lib/action_controller/routing | |
| parent | 945bf9c254b5bfb56df874c1a3f7f0f1e89dc8b8 (diff) | |
| parent | 24affdc88c4a4af03ce1ec5b23c3def18b90effe (diff) | |
| download | rails-186fee48c796b104b76ef69decb32ef396f435db.tar.gz rails-186fee48c796b104b76ef69decb32ef396f435db.tar.bz2 rails-186fee48c796b104b76ef69decb32ef396f435db.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/routing')
| -rw-r--r-- | actionpack/lib/action_controller/routing/route_set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing/route_set.rb b/actionpack/lib/action_controller/routing/route_set.rb index 70cd1f642d..172b867bf0 100644 --- a/actionpack/lib/action_controller/routing/route_set.rb +++ b/actionpack/lib/action_controller/routing/route_set.rb @@ -430,7 +430,7 @@ module ActionController def call(env) request = ActionDispatch::Request.new(env) app = Routing::Routes.recognize(request) - app.call(env).to_a + app.call(env) end def recognize(request) |