diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-12-25 18:46:30 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-12-25 18:46:30 +0200 |
| commit | c922092bc4b02430dc21771ab61da00971ab73f2 (patch) | |
| tree | 01f1fcb1e02cb962c0518b5433ba63be1853d7b3 /app/controllers/projects/notes_controller.rb | |
| parent | 9f6a62ead4a972b47453c0bf20c7d71266ddaf0f (diff) | |
| parent | fd231ff9fb6292c2fd15f71c5329216e67935560 (diff) | |
| download | gitlab-ce-c922092bc4b02430dc21771ab61da00971ab73f2.tar.gz | |
Merge remote-tracking branch 'origin/master' into ce_upstream
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) |