diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-12-17 14:29:55 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-12-22 23:12:23 +0200 |
| commit | a48dd40a926fdeddfdd76cea5db468a82096c7f4 (patch) | |
| tree | 523151bfaa5c0f8f554b0029ae8dd5ae3a7ddc86 /app/controllers/projects/notes_controller.rb | |
| parent | 3b61dc47ec377b857b66f9b2a81a183276163f4e (diff) | |
| download | gitlab-ce-a48dd40a926fdeddfdd76cea5db468a82096c7f4.tar.gz | |
base implementation of emoji picker [ci skip]
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) |