summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-01-10 13:43:32 +0000
committerSean McGivern <sean@gitlab.com>2018-01-10 13:47:24 +0000
commitca2755619b36d11b3e25c107505aa7d99c3d8352 (patch)
treeb4caa6d8ad493c7ee6dcfa8a8a1df4149e6c09e9 /app
parent44c8f919b4ba73fee6215ce2d6b023c666f34177 (diff)
downloadgitlab-ce-ca2755619b36d11b3e25c107505aa7d99c3d8352.tar.gz
Never set special MR titles for external issues
Diffstat (limited to 'app')
-rw-r--r--app/services/merge_requests/build_service.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 9781fecfb50..22b9b91a957 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -154,13 +154,9 @@ module MergeRequests
end
def assign_title_from_issue
- return unless issue
+ return unless issue && issue.is_a?(Issue)
- merge_request.title =
- case issue
- when Issue then "Resolve \"#{issue.title}\""
- when ExternalIssue then merge_request.source_branch.titleize.humanize
- end
+ merge_request.title = "Resolve \"#{issue.title}\""
end
def issue_iid