diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-12-25 01:31:02 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-12-25 01:31:02 +0200 |
| commit | d18fd3f6489ad2a8065f8ddd80ca51100eb50b5e (patch) | |
| tree | 1e809b9c4f694e20e9cc7dff06a9cb7f2f56aef2 /app/controllers/projects/notes_controller.rb | |
| parent | e74affcfa84acaddc236d6dfed7be1a61470dc0e (diff) | |
| parent | 350d65503f0fa34ae397942578c5ea8b2a46a629 (diff) | |
| download | gitlab-ce-ci_triggers_docs.tar.gz | |
Merge branch 'master' into ci_triggers_docsci_triggers_docs
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index ee705f32e81..6f1e186d408 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -139,7 +139,6 @@ class Projects::NotesController < Projects::ApplicationController discussion_id: note.discussion_id, html: note_to_html(note), award: note.is_award, - emoji_path: note.is_award ? view_context.image_url(::AwardEmoji.path_to_emoji_image(note.note)) : "", note: note.note, discussion_html: note_to_discussion_html(note), discussion_with_diff_html: note_to_discussion_with_diff_html(note) |