diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 10:17:27 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 10:17:27 +0100 |
| commit | e04e957bd6201a5789e12a3609d58a947bf16f7a (patch) | |
| tree | b1cca8028b01f4925cf0b13d6e1ef0fbe235fcac | |
| parent | 17f6a916d0f6d3b687973bb9ae88e4a79f1cccf5 (diff) | |
| parent | 423d2d621a3b244bc64b40e84cd7e6043cc1525f (diff) | |
| download | gitlab-ce-e04e957bd6201a5789e12a3609d58a947bf16f7a.tar.gz | |
Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/gitlab-ce
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/services/create_branch_service.rb | 1 | ||||
| -rw-r--r-- | app/services/delete_branch_service.rb | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 47f47e1228e..efb261f6573 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -35,6 +35,7 @@ v 8.4.0 (unreleased) v 8.3.3 (unreleased) - 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 - 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) diff --git a/app/services/create_branch_service.rb b/app/services/create_branch_service.rb index f139872c728..c0e08a151f2 100644 --- a/app/services/create_branch_service.rb +++ b/app/services/create_branch_service.rb @@ -31,7 +31,6 @@ class CreateBranchService < BaseService if 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_services(push_data.dup, :push_hooks) 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) |