Merge branch 'master' of github.com:gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents 6db121cb 94b8c09c
Showing 1 changed file with 4 additions and 0 deletions Show diff stats
app/controllers/projects_controller.rb
@@ -93,7 +93,11 @@ class ProjectsController &lt; 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 }
...	...	@@ -93,7 +93,11 @@ class ProjectsController < ApplicationController
93	93	end
94	94
95	95	def destroy
	96	+ # Disable the UsersProject update_repository call, otherwise it will be
	97	+ # called once for every person removed from the project
	98	+ UsersProject.skip_callback(:destroy, :after, :update_repository)
96	99	project.destroy
	100	+ UsersProject.set_callback(:destroy, :after, :update_repository)
97	101
98	102	respond_to do \|format\|
99	103	format.html { redirect_to projects_url }
...	...