diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-12 15:51:35 +0300 |
|---|---|---|
| committer | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 16:58:11 +0300 |
| commit | b93a76b08f21e482d15118065eaf61f18451b4ae (patch) | |
| tree | 3731b4ef9aec4f12d233412667c009e6fc3b8b0b /lib | |
| parent | 32035070ccdf41b1f26bfcd59fad3fe9c97a6f80 (diff) | |
Merge branch 'jprovazn-description' into 'master'
Use message body for merge request description
Closes #40968
See merge request gitlab-org/gitlab-ce!15839
(cherry picked from commit 52d9ee6299a55fc3362a47207e3d62fba1dfbdd1)
b39b5524 Use message body for merge request description
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/email/handler/create_merge_request_handler.rb | 4 |
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 |