diff options
| author | Richard Schneeman <richard.schneeman@gmail.com> | 2016-06-20 10:27:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-20 10:27:24 -0500 |
| commit | ce459720ec5ef039d1f825c69bd3d929d5885996 (patch) | |
| tree | 84978db672d9de8af0f398f71f84fbf35c0a6203 /railties/lib | |
| parent | 998d3044515f37c252cf5acfe923c4b69dcbd33c (diff) | |
| parent | 9d513e0a19f2b9333cd752b2747db4f350fcddc4 (diff) | |
| download | rails-ce459720ec5ef039d1f825c69bd3d929d5885996.tar.gz rails-ce459720ec5ef039d1f825c69bd3d929d5885996.tar.bz2 rails-ce459720ec5ef039d1f825c69bd3d929d5885996.zip | |
Merge pull request #25430 from nfm/fix-rails-info-routes-for-apps-with-globbing-route
Fix rails/info routes for apps with globbing route
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/finisher.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index 4e24640510..97dde9a3e9 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -21,10 +21,13 @@ module Rails initializer :add_builtin_route do |app| if Rails.env.development? - app.routes.append do + app.routes.prepend do get '/rails/info/properties' => "rails/info#properties", internal: true get '/rails/info/routes' => "rails/info#routes", internal: true get '/rails/info' => "rails/info#index", internal: true + end + + app.routes.append do get '/' => "rails/welcome#index", internal: true end end |