aboutsummaryrefslogtreecommitdiffstats
path: root/railties/configs
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-07-12 21:39:36 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-07-12 21:39:36 +0100
commit0cfa3574d599f3bc134cd13fa00d8f22809dd67b (patch)
treeb8af1a893ba900c9901c9b1fb7a9a2246aba67c6 /railties/configs
parentef67bd481bacd1ff36a79b7f23f3c08f12f6cbe1 (diff)
parent99cc85bc099a757cdd44e4f5f1be4972ab124e0d (diff)
downloadrails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.tar.gz
rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.tar.bz2
rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.zip
Merge commit 'mainstream/master'
Conflicts: actionpack/lib/action_controller/base.rb railties/lib/rails_generator/commands.rb
Diffstat (limited to 'railties/configs')
-rw-r--r--railties/configs/routes.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/configs/routes.rb b/railties/configs/routes.rb
index b579d6c7d1..4f3d9d22dd 100644
--- a/railties/configs/routes.rb
+++ b/railties/configs/routes.rb
@@ -36,6 +36,8 @@ ActionController::Routing::Routes.draw do |map|
# See how all your routes lay out with "rake routes"
# Install the default routes as the lowest priority.
+ # Note: These default routes make all actions in every controller accessible via GET requests. You should
+ # consider removing the them or commenting them out if you're using named routes and resources.
map.connect ':controller/:action/:id'
map.connect ':controller/:action/:id.:format'
end