summaryrefslogtreecommitdiff
path: root/app/services/system_notes/merge_requests_service.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-16 18:18:33 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-16 18:18:33 +0000
commitf64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch)
treea2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/services/system_notes/merge_requests_service.rb
parentbfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff)
downloadgitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/services/system_notes/merge_requests_service.rb')
-rw-r--r--app/services/system_notes/merge_requests_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/system_notes/merge_requests_service.rb b/app/services/system_notes/merge_requests_service.rb
index 99e03e67bf1..546a23c95c2 100644
--- a/app/services/system_notes/merge_requests_service.rb
+++ b/app/services/system_notes/merge_requests_service.rb
@@ -90,14 +90,14 @@ module SystemNotes
# Example Note text is based on event_type:
#
# update: "changed target branch from `Old` to `New`"
- # delete: "changed automatically target branch to `New` because `Old` was deleted"
+ # delete: "deleted the `Old` branch. This merge request now targets the `New` branch"
#
# Returns the created Note object
def change_branch(branch_type, event_type, old_branch, new_branch)
body =
case event_type.to_s
when 'delete'
- "changed automatically #{branch_type} branch to `#{new_branch}` because `#{old_branch}` was deleted"
+ "deleted the `#{old_branch}` branch. This merge request now targets the `#{new_branch}` branch"
when 'update'
"changed #{branch_type} branch from `#{old_branch}` to `#{new_branch}`"
else