Created
February 22, 2012 17:46
-
-
Save arunagw/1886280 to your computer and use it in GitHub Desktop.
fix_build
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb | |
index bb0441c..f66d28b 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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment