diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-11 12:17:27 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-11 20:16:57 +0300 |
| commit | d295f74375cc41bbe2bd6010e12187baccd761b7 (patch) | |
| tree | 4c7034fd3d1bb88541177b39fe240d351c21f74c | |
| parent | 78d9c904380f2a8b0eb2c8a3a1d340d1aff417df (diff) | |
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 075d598081d..d044ac62741 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. 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 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) |