diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-09-14 16:59:28 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-09-24 12:02:26 +0100 |
| commit | 487ac98a2a7cebb1bdef3a5038c926c56380881c (patch) | |
| tree | e8123fa91ebe22baedb0d4433ce7b82818f05401 /app/views/notify | |
| parent | 81d949f656979429835e0b6059a10a44faba488b (diff) | |
| download | gitlab-ce-487ac98a2a7cebb1bdef3a5038c926c56380881c.tar.gz | |
Ports new refactor from EE to CE
Diffstat (limited to 'app/views/notify')
| -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, 2 insertions, 2 deletions
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml index dd6a84e503d..5acd45b74a7 100644 --- a/app/views/notify/new_merge_request_email.html.haml +++ b/app/views/notify/new_merge_request_email.html.haml @@ -9,7 +9,7 @@ %p Assignee: #{@merge_request.assignee_name} -= render_if_exists 'notify/merge_request_approvers', merge_request: @merge_request += render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter - if @merge_request.description %div diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb index d5b8f8d764f..754f4bca1cd 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 %> +<%= render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter %> <%= @merge_request.description %> |