diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-20 17:05:53 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-20 17:05:53 +0000 |
| commit | 5311de409127c12749ed6750f941cf6de27db131 (patch) | |
| tree | 76ff7074927709245b988ebf121c0a48a5885b94 | |
| parent | bba0b9f9300bcbfd844d04f1a3732f3048da206f (diff) | |
| parent | 8830cfaa60806fa637785535b3ca35a8c3b9dcff (diff) | |
| download | gitlab-ce-5311de409127c12749ed6750f941cf6de27db131.tar.gz | |
Merge branch 'mr-title-single-commit' into 'master'
Base new MR title on commit title if there's only one.
Closes #2029.
See merge request !1558
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 11 |
1 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 859c3f56b2b..30e0cbae024 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -16,9 +16,6 @@ module MergeRequests return build_failed(merge_request, nil) end - # Generate suggested MR title based on source branch name - merge_request.title = merge_request.source_branch.titleize.humanize - compare_result = CompareService.new.execute( current_user, merge_request.source_project, @@ -52,6 +49,14 @@ module MergeRequests merge_request.compare_failed = false end + commits = merge_request.compare_commits + merge_request.title = \ + if commits && commits.count == 1 + commits.first.title + else + merge_request.source_branch.titleize.humanize + end + merge_request rescue Gitlab::Satellite::BranchesWithoutParent |