diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-16 13:51:45 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-16 13:51:45 +0000 |
| commit | d60047bb312df9efacd09bf9527787461cd78b3e (patch) | |
| tree | 2eee2b6c3d445960fcf7d42bfe4639c0e44f7cad | |
| parent | 089696b46202b40e648725aa9ef2be0a9ec81e19 (diff) | |
| parent | ddd806c66f7b1b064243f81e36412ddbe557b8da (diff) | |
| download | gitlab-ce-d60047bb312df9efacd09bf9527787461cd78b3e.tar.gz | |
Merge branch 'remove-author-from-email' into 'master'
Revert "Make sure notify email always has author info."
This reverts commit 303f79f8046876c7a461708dee5d1f50f12737bf.
See merge request !2103
| -rw-r--r-- | app/views/notify/_note_message.html.haml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/views/notify/_note_message.html.haml b/app/views/notify/_note_message.html.haml index 27112c6745a..00cb4aa24cc 100644 --- a/app/views/notify/_note_message.html.haml +++ b/app/views/notify/_note_message.html.haml @@ -1,4 +1,2 @@ %div - "#{link_to @note.author_name, user_url(@note.author)} wrote:" -%div = markdown(@note.note, pipeline: :email) |