summaryrefslogtreecommitdiff
path: root/app/services/delete_branch_service.rb
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2016-01-14 10:58:40 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2016-01-14 10:58:40 +0100
commit57a67c4fdb147b4b9eee9f8de35004b86fe9ed12 (patch)
tree43c2118bea0b973bb5ac6acb7a2b910ed9cab527 /app/services/delete_branch_service.rb
parent633ac13404a38bfa3901f515179dc795cded2fa9 (diff)
parentd139276a3757d3df45232b557e1bb388d21268d0 (diff)
downloadgitlab-ce-57a67c4fdb147b4b9eee9f8de35004b86fe9ed12.tar.gz
Merge branch '8-4-stable' into ci/api-triggers
* 8-4-stable: (280 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Version 8.4.0.rc1 Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR ...
Diffstat (limited to 'app/services/delete_branch_service.rb')
-rw-r--r--app/services/delete_branch_service.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/services/delete_branch_service.rb b/app/services/delete_branch_service.rb
index 22bf9dd935e..004b3ce7286 100644
--- a/app/services/delete_branch_service.rb
+++ b/app/services/delete_branch_service.rb
@@ -27,7 +27,6 @@ class DeleteBranchService < BaseService
if repository.rm_branch(current_user, branch_name)
push_data = build_push_data(branch)
- EventCreateService.new.push(project, current_user, push_data)
project.execute_hooks(push_data.dup, :push_hooks)
project.execute_services(push_data.dup, :push_hooks)