summaryrefslogtreecommitdiff
path: root/lib/gitlab/email
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2017-12-11 10:14:11 +0100
committerJan Provaznik <jprovaznik@gitlab.com>2017-12-11 11:46:21 +0100
commitb39b5524f28f550420b9833f5dbc4a0c300a0dfb (patch)
tree9005cb4c01231c2d69adeece69bfa0e277aba7e9 /lib/gitlab/email
parent806a68a81f1baeed07c146b1b5d9eb77796c46ba (diff)
downloadgitlab-ce-b39b5524f28f550420b9833f5dbc4a0c300a0dfb.tar.gz
Use message body for merge request descriptionjprovazn-description
When a merge request is created from email, use message body as merge request description. If message body is empty then merge request description is still created from the source branch commit (if there is only single commit in the merge request). If message body is empty and there are multiple commits in the source branch, then merge request description is left empty. Closes #40968
Diffstat (limited to 'lib/gitlab/email')
-rw-r--r--lib/gitlab/email/handler/create_merge_request_handler.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/email/handler/create_merge_request_handler.rb b/lib/gitlab/email/handler/create_merge_request_handler.rb
index c63666b98c1..e2f7c1d0257 100644
--- a/lib/gitlab/email/handler/create_merge_request_handler.rb
+++ b/lib/gitlab/email/handler/create_merge_request_handler.rb
@@ -55,11 +55,13 @@ module Gitlab
end
def merge_request_params
- {
+ params = {
source_project_id: project.id,
source_branch: mail.subject,
target_project_id: project.id
}
+ params[:description] = message if message.present?
+ params
end
end
end