summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-02-20 23:33:23 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-02-20 23:33:23 +0000
commitb180476bd69bdf99b1727b041116fa8447c0201f (patch)
tree7e138c24bbfaa121da3fba81349233a3acb43592 /app
parent8ae3112b3f303c897c70952dd162589b1c394221 (diff)
parent2f76ccdfac59f7bb6875e0a7753a390d4f6f2b38 (diff)
downloadgitlab-ce-b180476bd69bdf99b1727b041116fa8447c0201f.tar.gz
Merge branch 'mr-body-single-commit' into 'master'
Base new MR description on commit description if there's only one. Closes #2029, again. See merge request !1561
Diffstat (limited to 'app')
-rw-r--r--app/services/merge_requests/build_service.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 30e0cbae024..a44b91166e8 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -50,12 +50,13 @@ module MergeRequests
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
+ if commits && commits.count == 1
+ commit = commits.first
+ merge_request.title = commit.title
+ merge_request.description = commit.description.try(:strip)
+ else
+ merge_request.title = merge_request.source_branch.titleize.humanize
+ end
merge_request