summaryrefslogtreecommitdiff
path: root/app/models/note.rb
diff options
context:
space:
mode:
authordixpac <dino.onex@gmail.com>2016-07-03 16:04:22 +0200
committerdixpac <dino.onex@gmail.com>2016-07-14 08:51:00 +0200
commite21492b810bf9cd30f0e60836c056a72e830f427 (patch)
treeaf13b1f7482ce738408e396c649134c7fab974f0 /app/models/note.rb
parent7968484dfa363537e6e7822ca1ec100bcd0ec4f8 (diff)
downloadgitlab-ce-e21492b810bf9cd30f0e60836c056a72e830f427.tar.gz
Fix not normalized emoji paths
* There where path where +1 was stored as +1 not as thumbsup that was causing problems such as showing thumbsup icon 2 time. I fixed this to always normalize and store +1 as tumbsup
Diffstat (limited to 'app/models/note.rb')
-rw-r--r--app/models/note.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/note.rb b/app/models/note.rb
index 8dca2ef09a8..0ce10c77de9 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -229,8 +229,7 @@ class Note < ActiveRecord::Base
end
def award_emoji_name
- original_name = note.match(Banzai::Filter::EmojiFilter.emoji_pattern)[1]
- Gitlab::AwardEmoji.normalize_emoji_name(original_name)
+ note.match(Banzai::Filter::EmojiFilter.emoji_pattern)[1]
end
private