diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 21:08:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 21:08:06 +0000 |
| commit | e1549c75843d235607aebac9ed64f2fd10e549ed (patch) | |
| tree | d6b4213b87b57b323464c7e5c1b75091212f3373 /app/services | |
| parent | 5d75b2b9a9d11c20667895e6aa68ea4e76658c5d (diff) | |
| download | gitlab-ce-e1549c75843d235607aebac9ed64f2fd10e549ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index 456cc589477..80991657688 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -220,7 +220,7 @@ module MergeRequests def append_closes_description return unless issue&.to_reference.present? - closes_issue = "Closes #{issue.to_reference}" + closes_issue = "#{target_project.autoclose_referenced_issues ? 'Closes' : 'Related to'} #{issue.to_reference}" if description.present? descr_parts = [merge_request.description, closes_issue] |