Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-11 12:17:27 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-11 12:17:27 +0300
commite04e957bd6201a5789e12a3609d58a947bf16f7a (patch)
treeb1cca8028b01f4925cf0b13d6e1ef0fbe235fcac /app/services
parent17f6a916d0f6d3b687973bb9ae88e4a79f1cccf5 (diff)
parent423d2d621a3b244bc64b40e84cd7e6043cc1525f (diff)
Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/gitlab-ce
Diffstat (limited to 'app/services')
-rw-r--r--app/services/create_branch_service.rb1
-rw-r--r--app/services/delete_branch_service.rb1
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)