diff options
| author | José Valim <jose.valim@gmail.com> | 2011-06-16 02:11:35 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-06-16 02:11:35 -0700 |
| commit | 43ed24e23bd9d8dca48af6a5aece5da1b09e6fa2 (patch) | |
| tree | 7e7076df59058a0b6b6c3a61fa4848a11fed190b | |
| parent | 7de3b362e34a5036502956d0d6c832ba3e3b0d1c (diff) | |
| parent | d7aac1f1e4f4c6b9d8b98ce02dc1d62cc6ccfa0b (diff) | |
| download | rails-43ed24e23bd9d8dca48af6a5aece5da1b09e6fa2.tar.gz rails-43ed24e23bd9d8dca48af6a5aece5da1b09e6fa2.tar.bz2 rails-43ed24e23bd9d8dca48af6a5aece5da1b09e6fa2.zip | |
Merge pull request #1727 from ihower/improve_legacy_wild_controller_route
Improve the legacy wild controller route in app templates
| -rw-r--r-- | actionpack/lib/action_dispatch/routing.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/routes.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb index 74c090f260..1dcd83ceb5 100644 --- a/actionpack/lib/action_dispatch/routing.rb +++ b/actionpack/lib/action_dispatch/routing.rb @@ -161,7 +161,7 @@ module ActionDispatch # Consider the following route, which you will find commented out at the # bottom of your generated <tt>config/routes.rb</tt>: # - # match ':controller(/:action(/:id(.:format)))' + # match ':controller(/:action(/:id))(.:format)' # # This route states that it expects requests to consist of a # <tt>:controller</tt> followed optionally by an <tt>:action</tt> that in diff --git a/railties/lib/rails/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb index d50f536164..ea81748464 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/routes.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb @@ -54,5 +54,5 @@ # This is a legacy wild controller route that's not recommended for RESTful applications. # Note: This route will make all actions in every controller accessible via GET requests. - # match ':controller(/:action(/:id(.:format)))' + # match ':controller(/:action(/:id))(.:format)' end |