summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-02-12 17:29:28 -0800
committerStan Hu <stanhu@gmail.com>2018-02-12 17:34:18 -0800
commit926002fdf8d83147cfb577939bd3f8e75da56548 (patch)
treeb1148e6455a6b2d7a03d80eb463416444565503a /app/services
parent498ade4801a822f8704390b10d178af9fe7987cb (diff)
downloadgitlab-ce-926002fdf8d83147cfb577939bd3f8e75da56548.tar.gz
Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193
When JIRA or Redmine were enabled and the branch name did not match the matching regular expression, the `issue_iid` would be `nil`, preventing users from creating merge requests. Closes #43193
Diffstat (limited to 'app/services')
-rw-r--r--app/services/merge_requests/build_service.rb8
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