diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-01-08 00:32:04 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-01-08 00:37:41 -0800 |
| commit | 423d2d621a3b244bc64b40e84cd7e6043cc1525f (patch) | |
| tree | 19182d0ae1b5d686424bca6671557278b75a3767 | |
| parent | b1539116f65c302729ca4130a30169295dcfc07e (diff) | |
| download | gitlab-ce-423d2d621a3b244bc64b40e84cd7e6043cc1525f.tar.gz | |
Fix duplicated branch creation/deletion events when using Web UI
When deleting a branch, this is what was happening:
1. DeleteBranchService calls EventCreateService and creates an event.
2. The call to repository.rm_branch triggers the GitHooksService.
3. This, in turn, calls GitPushService and then calls EventCreateService again.
5145706c now makes it no longer necessary for DeleteBranchService and CreateBranchService to create an event.
Closes #4304
| -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 dfee55d963b..f7032f52bc0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -28,6 +28,7 @@ v 8.4.0 (unreleased) - Ajax filter by message for commits page v 8.3.3 (unreleased) + - 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 - Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu) - Enable "Add key" button when user fills in a proper key (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) |