diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-13 13:11:56 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-13 13:11:56 +0300 |
commit | 754d1ec4c03c206376178e17af3f5d78a1e16a08 (patch) | |
tree | 872bff1ba5a6ba36cfa1fd3ce55189796fc05f39 /app | |
parent | 8925671a063180e6bbb6c3c6dcbfe9fdb908ef50 (diff) | |
parent | 926002fdf8d83147cfb577939bd3f8e75da56548 (diff) |
Merge branch 'sh-fix-issue-43193' into 'master'
Fix Error 500s creating merge requests with external issue tracker
Closes #43193
See merge request gitlab-org/gitlab-ce!17073
Diffstat (limited to 'app')
-rw-r--r-- | app/services/merge_requests/build_service.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index 2ae855d078b..ab6f8ea44a9 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -160,10 +160,12 @@ module MergeRequests merge_request.title = "Resolve \"#{issue.title}\"" if issue.is_a?(Issue) - unless merge_request.title - branch_title = source_branch.downcase.remove(issue_iid.downcase).titleize.humanize + return if merge_request.title.present? + + if issue_iid.present? merge_request.title = "Resolve #{issue_iid}" - merge_request.title += " \"#{branch_title}\"" unless branch_title.empty? + branch_title = source_branch.downcase.remove(issue_iid.downcase).titleize.humanize + merge_request.title += " \"#{branch_title}\"" if branch_title.present? end end |