diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-06-12 11:37:12 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-06-18 12:22:05 +0100 |
| commit | dbbc7d53ada13e5f350010f507adfe0a4014d4d9 (patch) | |
| tree | 6e056facb5ba3e38240d5f8a0150c7a536cbcbfa | |
| parent | 899a0ef7fe8bec171b14f7864ab7e40e9a400fc5 (diff) | |
| download | gitlab-ce-extra-ee-specific-lines-from-discussion-views.tar.gz | |
Remove EE-specific code from new MR emailextra-ee-specific-lines-from-discussion-views
| -rw-r--r-- | app/views/notify/new_merge_request_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/new_merge_request_email.text.erb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml index 0a9adc6f243..dd6a84e503d 100644 --- a/app/views/notify/new_merge_request_email.html.haml +++ b/app/views/notify/new_merge_request_email.html.haml @@ -9,6 +9,8 @@ %p Assignee: #{@merge_request.assignee_name} += render_if_exists 'notify/merge_request_approvers', merge_request: @merge_request + - if @merge_request.description %div = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author) diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb index 7d98400e6fe..d5b8f8d764f 100644 --- a/app/views/notify/new_merge_request_email.text.erb +++ b/app/views/notify/new_merge_request_email.text.erb @@ -5,6 +5,6 @@ New Merge Request <%= @merge_request.to_reference %> <%= merge_path_description(@merge_request, 'to') %> Author: <%= @merge_request.author_name %> Assignee: <%= @merge_request.assignee_name %> +<%= render_if_exists 'notify/merge_request_approvers', merge_request: @merge_request %> <%= @merge_request.description %> - |