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

132177c2 · Dmitriy Zaporozhets · 6db121cb · 94b8c09c · 132177c2
Commit 132177c2 authored Dec 17, 2011 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

app/controllers/projects_controller.rb app/controllers/projects_controller.rb +4 -0

No files found.
--- 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 }