diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index 5168d4df8b463fb7c00264d2dc58208b9b5f0adb..07039624ff66d938644530381deacd15dd55313c 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 } diff --git a/app/models/event.rb b/app/models/event.rb index a6b5167fba67082cfed4b4f197194a0ba0149356..50c87f8465597904e62dd51f5721c689a9321574 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -54,6 +54,19 @@ class Event < ActiveRecord::Base Event::COMMENTED end end + + def create_rm_branch(project, user, branch) + Event.create( + project: project, + action: Event::PUSHED, + data: { + ref: branch.name, + before: branch.commit.id, + after: '00000000' + }, + author_id: user.id + ) + end end def proper?