diff options
author | Benedikt Huss <benedikt.huss@gmail.com> | 2018-01-09 11:40:09 +0100 |
---|---|---|
committer | Benedikt Huß <benedikt.huss@werkdigital.de> | 2018-01-09 12:24:40 +0100 |
commit | 44c8f919b4ba73fee6215ce2d6b023c666f34177 (patch) | |
tree | 78343c4126025bed26333539cf1bf188a8c6beca | |
parent | 639cfdc221617f13ee08e673e0b5e51efc344744 (diff) | |
download | gitlab-ce-44c8f919b4ba73fee6215ce2d6b023c666f34177.tar.gz |
Fix incorrect default merge request title when external issue tracker is activated
-rw-r--r-- | app/services/merge_requests/build_service.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/36669-default-mr-title-with-external-issues.yml | 5 | ||||
-rw-r--r-- | spec/services/merge_requests/build_service_spec.rb | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index 9622a5c5462..9781fecfb50 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -159,7 +159,7 @@ module MergeRequests merge_request.title = case issue when Issue then "Resolve \"#{issue.title}\"" - when ExternalIssue then "Resolve #{issue.title}" + when ExternalIssue then merge_request.source_branch.titleize.humanize end end diff --git a/changelogs/unreleased/36669-default-mr-title-with-external-issues.yml b/changelogs/unreleased/36669-default-mr-title-with-external-issues.yml new file mode 100644 index 00000000000..08523d01a72 --- /dev/null +++ b/changelogs/unreleased/36669-default-mr-title-with-external-issues.yml @@ -0,0 +1,5 @@ +--- +title: Default merge request title is set correctly again when external issue tracker is activated +merge_request: +author: +type: fixed diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb index a9605c6e4c6..4b670d3530e 100644 --- a/spec/services/merge_requests/build_service_spec.rb +++ b/spec/services/merge_requests/build_service_spec.rb @@ -241,8 +241,8 @@ describe MergeRequests::BuildService do allow(project).to receive(:external_issue_tracker).and_return(true) end - it 'sets the title to: Resolves External Issue $issue-iid' do - expect(merge_request.title).to eq('Resolve External Issue 12345') + it 'sets the title to the humanized branch title' do + expect(merge_request.title).to eq('12345 fix issue') end end end |