summaryrefslogtreecommitdiff
path: root/app/controllers/projects/notes_controller.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-11-22 01:51:00 +0200
committerValery Sizov <vsv2711@gmail.com>2015-11-22 01:51:00 +0200
commit3fc10d46f180d5b1904496e4f4e528d215057dbd (patch)
tree6d3cb221b892ae87febcc8153942c78267814899 /app/controllers/projects/notes_controller.rb
parentfbac9e106dd6acf35ba679b106b438a3bbfd191f (diff)
downloadgitlab-ce-3fc10d46f180d5b1904496e4f4e528d215057dbd.tar.gz
Emoji bug: Invalid url to imageaward_fix
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
-rw-r--r--app/controllers/projects/notes_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index ead940aea6c..5ac18446aa7 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -136,7 +136,7 @@ class Projects::NotesController < Projects::ApplicationController
discussion_id: note.discussion_id,
html: note_to_html(note),
award: note.is_award,
- emoji_path: note.is_award ? ::AwardEmoji.path_to_emoji_image(note.note) : "",
+ 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)