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
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-11 12:17:27 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-01-11 20:16:57 +0300
commitd295f74375cc41bbe2bd6010e12187baccd761b7 (patch)
tree4c7034fd3d1bb88541177b39fe240d351c21f74c /app
parent78d9c904380f2a8b0eb2c8a3a1d340d1aff417df (diff)
Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/gitlab-ce
Diffstat (limited to 'app')
-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 de18f3bc556..329dfea64fa 100644
--- a/app/services/create_branch_service.rb
+++ b/app/services/create_branch_service.rb
@@ -18,7 +18,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)