diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-11-22 07:10:25 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-22 07:11:45 +0300 |
| commit | dbcd646296bfce1f734a05663ef160a3cf96cdd1 (patch) | |
| tree | 8287fb3ecdd6cbb1087ef16a3ae5cd486b142e61 | |
| parent | aeaa5b5037a30b4a49b520bd92ed6a40f55e7fb7 (diff) | |
Merge branch 'award_fix' into 'master'
Emoji bug: Invalid url to image
Closes #3591
See merge request !1868
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 2 | ||||
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 635c9b4f8d2..09b48fe5572 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -73,7 +73,7 @@ class @AwardsHandler getImage: (emoji, custom_path) -> if custom_path - $(".awards-menu li").first().html().replace(/emoji\/.*\.png/, custom_path) + $("<img>").attr({src: custom_path, width: 20, height: 20}).wrap("<div>").parent().html() else $("li[data-emoji='" + emoji + "']").html() 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) |