summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-12-12 12:51:35 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-12-12 12:51:35 +0000
commit52d9ee6299a55fc3362a47207e3d62fba1dfbdd1 (patch)
tree7c2c52d1e337b332e7e74d6f056601cf087aa7e4 /lib
parent2750d7e6606e91f608b9e379980e24f3a632cc5a (diff)
parentb39b5524f28f550420b9833f5dbc4a0c300a0dfb (diff)
downloadgitlab-ce-52d9ee6299a55fc3362a47207e3d62fba1dfbdd1.tar.gz
Merge branch 'jprovazn-description' into 'master'
Use message body for merge request description Closes #40968 See merge request gitlab-org/gitlab-ce!15839
Diffstat (limited to 'lib')
-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