Commit 6d139565 authored by Valery Sizov's avatar Valery Sizov

Merge branch 'notes_fix_to_stable' into '8-2-stable'

Fix for Emoji (to stable)



See merge request !1850
parents cd44d16a c279bd81
...@@ -80,7 +80,7 @@ class @AwardsHandler ...@@ -80,7 +80,7 @@ class @AwardsHandler
postEmoji: (emoji, callback) -> postEmoji: (emoji, callback) ->
$.post @post_emoji_url, { note: { $.post @post_emoji_url, { note: {
note: emoji note: ":" + emoji + ":"
noteable_type: @noteable_type noteable_type: @noteable_type
noteable_id: @noteable_id noteable_id: @noteable_id
}},(data) -> }},(data) ->
......
...@@ -65,7 +65,7 @@ class Projects::NotesController < Projects::ApplicationController ...@@ -65,7 +65,7 @@ class Projects::NotesController < Projects::ApplicationController
data = { data = {
author: current_user, author: current_user,
is_award: true, is_award: true,
note: note_params[:note] note: note_params[:note].gsub(":", '')
} }
note = noteable.notes.find_by(data) note = noteable.notes.find_by(data)
......
...@@ -90,6 +90,8 @@ module IssuesHelper ...@@ -90,6 +90,8 @@ module IssuesHelper
def url_to_emoji(name) def url_to_emoji(name)
emoji_path = ::AwardEmoji.path_to_emoji_image(name) emoji_path = ::AwardEmoji.path_to_emoji_image(name)
url_to_image(emoji_path) url_to_image(emoji_path)
rescue StandardError
""
end end
def emoji_author_list(notes, current_user) def emoji_author_list(notes, current_user)
......
...@@ -35,11 +35,11 @@ module Notes ...@@ -35,11 +35,11 @@ module Notes
end end
def contains_emoji_only?(note) def contains_emoji_only?(note)
note =~ /\A:?[-_+[:alnum:]]*:?\s?\z/ note =~ /\A:[-_+[:alnum:]]*:\s?\z/
end end
def emoji_name(note) def emoji_name(note)
note.match(/\A:?([-_+[:alnum:]]*):?\s?/)[1] note.match(/\A:([-_+[:alnum:]]*):\s?/)[1]
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment