Commit e04e957b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/gitlab-ce

parents 17f6a916 423d2d62
...@@ -35,6 +35,7 @@ v 8.4.0 (unreleased) ...@@ -35,6 +35,7 @@ v 8.4.0 (unreleased)
v 8.3.3 (unreleased) v 8.3.3 (unreleased)
- Preserve CE behavior with JIRA integration by only calling API if URL is set - Preserve CE behavior with JIRA integration by only calling API if URL is set
- Fix duplicated branch creation/deletion events when using Web UI (Stan Hu)
- Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running - Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running
- Suppress e-mails on failed builds if allow_failure is set (Stan Hu) - Suppress e-mails on failed builds if allow_failure is set (Stan Hu)
- Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu) - Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu)
......
...@@ -31,7 +31,6 @@ class CreateBranchService < BaseService ...@@ -31,7 +31,6 @@ class CreateBranchService < BaseService
if new_branch if new_branch
push_data = build_push_data(project, current_user, new_branch) push_data = build_push_data(project, current_user, new_branch)
EventCreateService.new.push(project, current_user, push_data)
project.execute_hooks(push_data.dup, :push_hooks) project.execute_hooks(push_data.dup, :push_hooks)
project.execute_services(push_data.dup, :push_hooks) project.execute_services(push_data.dup, :push_hooks)
......
...@@ -27,7 +27,6 @@ class DeleteBranchService < BaseService ...@@ -27,7 +27,6 @@ class DeleteBranchService < BaseService
if repository.rm_branch(current_user, branch_name) if repository.rm_branch(current_user, branch_name)
push_data = build_push_data(branch) push_data = build_push_data(branch)
EventCreateService.new.push(project, current_user, push_data)
project.execute_hooks(push_data.dup, :push_hooks) project.execute_hooks(push_data.dup, :push_hooks)
project.execute_services(push_data.dup, :push_hooks) project.execute_services(push_data.dup, :push_hooks)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment