diff options
| author | José Valim <jose.valim@gmail.com> | 2011-06-07 09:08:51 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-06-07 09:08:51 -0700 |
| commit | 050d6ef060464427ae4ea559224c7040da268d5b (patch) | |
| tree | 50bcd1db24874fc7a48a0bec52abde3a1dc44fe8 /railties/lib/rails/commands | |
| parent | 72cca79d36ecdc740eebf519a6be6172d7bae0fc (diff) | |
| parent | 8496be7e119aee0e3e0edc877a3fe3998b797d29 (diff) | |
| download | rails-050d6ef060464427ae4ea559224c7040da268d5b.tar.gz rails-050d6ef060464427ae4ea559224c7040da268d5b.tar.bz2 rails-050d6ef060464427ae4ea559224c7040da268d5b.zip | |
Merge pull request #1516 from guilleiguaran/rack-urlmap-fix
Rails::Server#app should be nice with Rack::URLMap
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 91c87514cf..23392276d5 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -43,7 +43,7 @@ module Rails end def app - @app ||= super.instance + @app ||= super.respond_to?(:to_app) ? super.to_app : super end def opt_parser |