diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-11 15:03:33 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-11 15:03:33 +0300 |
| commit | e726644123c70eb8f62a6b6b433c2e4fea8e8a52 (patch) | |
| tree | 392f17657120ce1374be731edf4a139aa6d0b8d5 /app/services | |
| parent | e51e97ede30ed0e3724ef185052e0ef549d5b1d1 (diff) | |
| parent | f9cf2f99763129c4cab4ccd24b4d53886fbc8a92 (diff) | |
Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' into 'master'
Resolve "Incorrect default merge request title when Jira activated"
Closes #36669
See merge request gitlab-org/gitlab-ce!16356
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 8 |
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 9622a5c5462..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 "Resolve #{issue.title}" - end + merge_request.title = "Resolve \"#{issue.title}\"" end def issue_iid |