diff options
author | Stan Hu <stanhu@gmail.com> | 2016-01-08 11:32:04 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-01-08 11:37:41 +0300 |
commit | 423d2d621a3b244bc64b40e84cd7e6043cc1525f (patch) | |
tree | 19182d0ae1b5d686424bca6671557278b75a3767 /app/services | |
parent | b1539116f65c302729ca4130a30169295dcfc07e (diff) |
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
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/create_branch_service.rb | 1 | ||||
-rw-r--r-- | app/services/delete_branch_service.rb | 1 |
2 files changed, 0 insertions, 2 deletions
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) |