diff options
| author | Mek Stittri <mstittri@gitlab.com> | 2018-06-20 18:05:56 +0300 |
|---|---|---|
| committer | Mek Stittri <mstittri@gitlab.com> | 2018-06-20 18:05:56 +0300 |
| commit | 3e28cca5744410a82131bf02e17d785c7223d44b (patch) | |
| tree | 2a5713659df1ed0c6865714032af9ac2c8f73b2a /app/views/notify/new_merge_request_email.html.haml | |
| parent | acdc0d73274b80fb104eea73e86eb4b9f92c848d (diff) | |
| parent | abc6be62a06349f395da0b33e814512ef15c06fb (diff) | |
Resolve conflicts with latest workflow label changes
Diffstat (limited to 'app/views/notify/new_merge_request_email.html.haml')
| -rw-r--r-- | app/views/notify/new_merge_request_email.html.haml | 2 |
1 files changed, 2 insertions, 0 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) |