diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-10-21 18:49:19 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-10-21 18:49:19 +0530 |
| commit | f938019da210ea2bfccabdf61424852e8006c741 (patch) | |
| tree | 7cd316340f230efe5b2d55b7df5a85232e5d5db5 /guides/code/getting_started/config | |
| parent | cec66e589f69a10ab9d6e4b62dd34ff09e5dc01b (diff) | |
| parent | e84281398e79e09b637c888860fcefd6f82bf968 (diff) | |
| download | rails-f938019da210ea2bfccabdf61424852e8006c741.tar.gz rails-f938019da210ea2bfccabdf61424852e8006c741.tar.bz2 rails-f938019da210ea2bfccabdf61424852e8006c741.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activesupport/lib/active_support/core_ext/hash/slice.rb
guides/source/active_support_core_extensions.md
Diffstat (limited to 'guides/code/getting_started/config')
| -rw-r--r-- | guides/code/getting_started/config/routes.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/code/getting_started/config/routes.rb b/guides/code/getting_started/config/routes.rb index 04a6bd374e..d94b0d6f33 100644 --- a/guides/code/getting_started/config/routes.rb +++ b/guides/code/getting_started/config/routes.rb @@ -12,8 +12,8 @@ Blog::Application.routes.draw do # Keep in mind you can assign values other than :controller and :action # Sample of named route: - # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase - # This route can be invoked with purchase_url(:id => product.id) + # match 'products/:id/purchase' => 'catalog#purchase', as: :purchase + # This route can be invoked with purchase_url(id: product.id) # Sample resource route (maps HTTP verbs to controller actions automatically): # resources :products @@ -40,7 +40,7 @@ Blog::Application.routes.draw do # resources :products do # resources :comments # resources :sales do - # get 'recent', :on => :collection + # get 'recent', on: :collection # end # end |