diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-17 13:25:52 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | 79889a6aa3dc878d196d0f2f445ab6b10ef10c74 (patch) | |
| tree | 25367a69b4a529335e106d0d65c2d9a38e97f092 /app/views/notify/new_mention_in_merge_request_email.html.haml | |
| parent | 80b2e18fb62b8da7410f90b3e5340b9e63e765a3 (diff) | |
| download | gitlab-ce-79889a6aa3dc878d196d0f2f445ab6b10ef10c74.tar.gz | |
Add specs
Diffstat (limited to 'app/views/notify/new_mention_in_merge_request_email.html.haml')
| -rw-r--r-- | app/views/notify/new_mention_in_merge_request_email.html.haml | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/app/views/notify/new_mention_in_merge_request_email.html.haml b/app/views/notify/new_mention_in_merge_request_email.html.haml index cbd434be02a..07d8c301988 100644 --- a/app/views/notify/new_mention_in_merge_request_email.html.haml +++ b/app/views/notify/new_mention_in_merge_request_email.html.haml @@ -1,15 +1,4 @@ %p You have been mentioned in Merge Request #{@merge_request.to_reference} -- if current_application_settings.email_author_in_body - %div - #{link_to @merge_request.author_name, user_url(@merge_request.author)} wrote: -%p.details - != merge_path_description(@merge_request, '→') - -- if @merge_request.assignee_id.present? - %p - Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} - -- if @merge_request.description - = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author) += render template: 'new_merge_request_email' |