From f5046e5258c9e53b11816490fbdca4134dd5ad0c Mon Sep 17 00:00:00 2001 From: haseeb Date: Wed, 23 Aug 2017 21:43:23 +0530 Subject: [PATCH] [ci skip] changelog entry added for full merge request ref changes --- app/models/merge_request.rb | 1 - .../36262_merge_request_reference_in_merge_commit_global.yml | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/36262_merge_request_reference_in_merge_commit_global.yml diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index de0d541f1c7..a156ef672df 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -682,7 +682,6 @@ class MergeRequest < ActiveRecord::Base if !include_description && closes_issues_references.present? message << "Closes #{closes_issues_references.to_sentence}" end - message << "#{description}" if include_description && description.present? message << "See merge request #{to_reference(full: true)}" diff --git a/changelogs/unreleased/36262_merge_request_reference_in_merge_commit_global.yml b/changelogs/unreleased/36262_merge_request_reference_in_merge_commit_global.yml new file mode 100644 index 00000000000..356857d6e8a --- /dev/null +++ b/changelogs/unreleased/36262_merge_request_reference_in_merge_commit_global.yml @@ -0,0 +1,5 @@ +--- +title: Merge request reference in merge commit changed to full reference +merge_request: 13518 +author: haseebeqx +type: fixed