summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2011-12-17 05:40:21 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2011-12-17 05:40:21 -0800
commit94b8c09c22b67e22b213b3e1d7adb459d9390a2b (patch)
treeee47ff6270948633a8b3ac2d878a7cbba8e7e0ae
parentced572c328507e3d327f23e9673ba33584845501 (diff)
parent0bd7f91c6608e7cd72349c89494103aed40be22d (diff)
downloadgitlab-ce-94b8c09c22b67e22b213b3e1d7adb459d9390a2b.tar.gz
Merge pull request #214 from mutewinter/project_destroy_speed_fix
Project destroy relationship speed fix
-rw-r--r--app/controllers/projects_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1f1da559abf..5f4f2524327 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -93,7 +93,11 @@ class ProjectsController < ApplicationController
end
def destroy
+ # Disable the UsersProject update_repository call, otherwise it will be
+ # called once for every person removed from the project
+ UsersProject.skip_callback(:destroy, :after, :update_repository)
project.destroy
+ UsersProject.set_callback(:destroy, :after, :update_repository)
respond_to do |format|
format.html { redirect_to projects_url }