summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-16 22:43:14 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-16 22:43:14 +0300
commita165a0b23fd6cc81e7fc0163827310f69ce0399a (patch)
tree0869201153bcea8ea8e269ac6adab26d34dbdead /app/controllers
parentd207a31fc97edf4e19a50c4a650d6a34b4f5a2cf (diff)
downloadgitlab-ce-a165a0b23fd6cc81e7fc0163827310f69ce0399a.tar.gz
Create event on dashboard when branch removed via UI
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/branches_controller.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 5168d4df8b4..07039624ff6 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -14,7 +14,11 @@ class Projects::BranchesController < Projects::ApplicationController
end
def destroy
- @project.repository.rm_branch(params[:id])
+ branch = @project.repository.branches.find { |branch| branch.name == params[:id] }
+
+ if branch && @project.repository.rm_branch(branch.name)
+ Event.create_rm_branch(@project, current_user, branch)
+ end
respond_to do |format|
format.html { redirect_to project_branches_path }