aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorNicholas Firth-McCoy <nicholas@2suggestions.com.au>2016-06-18 18:46:44 +1000
committerNicholas Firth-McCoy <nicholas@2suggestions.com.au>2016-06-20 21:49:12 +1000
commit9d513e0a19f2b9333cd752b2747db4f350fcddc4 (patch)
tree551ad637aa116ba0944cf0d436f3981d7aa574f1 /railties/lib/rails
parent0c998a14c45430afe85188f8ad13a696b077ffd9 (diff)
downloadrails-9d513e0a19f2b9333cd752b2747db4f350fcddc4.tar.gz
rails-9d513e0a19f2b9333cd752b2747db4f350fcddc4.tar.bz2
rails-9d513e0a19f2b9333cd752b2747db4f350fcddc4.zip
Fix rails/info routes for apps with globbing route
The /rails/info routes were inaccessible in apps with a catch-all globbing route, as they were being appended after the globbing route and would never be matched. See also ccc3ddb7762bae0df7e2f8d643b19b6a4769d5be.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application/finisher.rb5
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