diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-26 13:18:44 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-26 17:14:06 +0200 |
| commit | 25c08d11bbf3a889501ebe295a1ab66a12a52d49 (patch) | |
| tree | 1d7901f8fe620609bb3331ad786c190964b5c2fa /app/views/notify | |
| parent | 86166d28029d5fcc729f7b7f5a41635c2e783a9e (diff) | |
| download | gitlab-ce-25c08d11bbf3a889501ebe295a1ab66a12a52d49.tar.gz | |
Added author to various Markdown calls in views
This ensures all these calls have an author set, allowing the use of
"all" mentions where possible.
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/_note_message.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/new_issue_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/new_merge_request_email.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/notify/_note_message.html.haml b/app/views/notify/_note_message.html.haml index 12ded41fbf2..e9c66170877 100644 --- a/app/views/notify/_note_message.html.haml +++ b/app/views/notify/_note_message.html.haml @@ -2,4 +2,4 @@ %div #{link_to @note.author_name, user_url(@note.author)} wrote: %div - = markdown(@note.note, pipeline: :email) + = markdown(@note.note, pipeline: :email, author: @note.author) diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml index ad3ab2525bb..f42b150c0d6 100644 --- a/app/views/notify/new_issue_email.html.haml +++ b/app/views/notify/new_issue_email.html.haml @@ -2,7 +2,7 @@ %div #{link_to @issue.author_name, user_url(@issue.author)} wrote: -if @issue.description - = markdown(@issue.description, pipeline: :email) + = markdown(@issue.description, pipeline: :email, author: @issue.author) - if @issue.assignee_id.present? %p diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml index 23423e7d981..158404de396 100644 --- a/app/views/notify/new_merge_request_email.html.haml +++ b/app/views/notify/new_merge_request_email.html.haml @@ -9,4 +9,4 @@ Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} -if @merge_request.description - = markdown(@merge_request.description, pipeline: :email) + = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author) |