summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/update_service.rb
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-11-01 18:35:14 +0100
committerJarka Kadlecova <jarka@gitlab.com>2017-11-02 07:14:35 +0100
commit064c8949bd2cbbd304909b84f4ddac3c80827b94 (patch)
tree2eda37a87768439b4485dd161b8aa0fe809ad923 /app/services/merge_requests/update_service.rb
parent101779e4e9fd83ef1890a7499ef9b2723fb75cbf (diff)
downloadgitlab-ce-064c8949bd2cbbd304909b84f4ddac3c80827b94.tar.gz
CE port of code changed for epicsjk-epic-changes-ce-port
Diffstat (limited to 'app/services/merge_requests/update_service.rb')
-rw-r--r--app/services/merge_requests/update_service.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 2832d893e95..1f394cacc64 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -40,10 +40,6 @@ module MergeRequests
merge_request.target_branch)
end
- if merge_request.previous_changes.include?('milestone_id')
- create_milestone_note(merge_request)
- end
-
if merge_request.previous_changes.include?('assignee_id')
create_assignee_note(merge_request)
notification_service.reassigned_merge_request(merge_request, current_user)
@@ -111,5 +107,11 @@ module MergeRequests
end
end
end
+
+ def create_branch_change_note(issuable, branch_type, old_branch, new_branch)
+ SystemNoteService.change_branch(
+ issuable, issuable.project, current_user, branch_type,
+ old_branch, new_branch)
+ end
end
end