diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-22 10:05:40 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-22 10:05:40 -0800 |
| commit | cdc1885d4198e1af8f3d15c4433fd19e2aa3e493 (patch) | |
| tree | 29a515b1bfa8dffde0aee2b0c97d90fc76e5ac99 | |
| parent | ef5670effd0088d147de5706078ba473d0d23c77 (diff) | |
| parent | a870d06c0a752927892bd47201e13a2471593a9b (diff) | |
| download | rails-cdc1885d4198e1af8f3d15c4433fd19e2aa3e493.tar.gz rails-cdc1885d4198e1af8f3d15c4433fd19e2aa3e493.tar.bz2 rails-cdc1885d4198e1af8f3d15c4433fd19e2aa3e493.zip | |
Merge pull request #5132 from rafaelfranca/fix-build
Fix routes inspection order
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index bb0441c100..f66d28bf83 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1014,10 +1014,10 @@ module ActionDispatch member do get :edit if parent_resource.actions.include?(:edit) get :show if parent_resource.actions.include?(:show) - delete :destroy if parent_resource.actions.include?(:destroy) if parent_resource.actions.include?(:update) send default_method_for_update, :update end + delete :destroy if parent_resource.actions.include?(:destroy) end end @@ -1156,10 +1156,10 @@ module ActionDispatch member do get :edit if parent_resource.actions.include?(:edit) get :show if parent_resource.actions.include?(:show) - delete :destroy if parent_resource.actions.include?(:destroy) if parent_resource.actions.include?(:update) send default_method_for_update, :update end + delete :destroy if parent_resource.actions.include?(:destroy) end end |