diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-24 09:09:45 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-24 09:09:45 +0000 |
| commit | 7ab4efa8f8c1c1c0b80684d13bfbb777485f1199 (patch) | |
| tree | 893684bad690399bdd9dc2f08305488488669d17 /app/models | |
| parent | 87119f78cfcf51d8748115e5921aa78b3295f7f1 (diff) | |
| parent | f5046e5258c9e53b11816490fbdca4134dd5ad0c (diff) | |
| download | gitlab-ce-7ab4efa8f8c1c1c0b80684d13bfbb777485f1199.tar.gz | |
Merge branch '36262_merge_request_reference_in_merge_commit_global' into 'master'
fix Merge request reference in merge commit is not global
Closes #36262
See merge request !13518
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index dde43e94cb5..dbc73ed3cd4 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -683,9 +683,8 @@ 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}" + message << "See merge request #{to_reference(full: true)}" message.join("\n\n") end |