diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-11 12:39:56 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-11 12:39:56 +0000 |
| commit | 2029be038b1a7f960f11b51511e081a1a8337d98 (patch) | |
| tree | 18faa50e9d67746be474577f395c720ff49df81b /app/models/note.rb | |
| parent | cd97dba2a9a26e83818f7e111bc0b0185a7ced8a (diff) | |
| parent | 72b7d1f59d4fb26fb9119c5a059528f0fc951904 (diff) | |
| download | gitlab-ce-2029be038b1a7f960f11b51511e081a1a8337d98.tar.gz | |
Merge branch 'emoji_aliases' into 'master'
Emoji aliases problem
Fixes #3850
See merge request !2064
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 8f0efa8d4b7..04053ccc61e 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -377,6 +377,7 @@ class Note < ActiveRecord::Base end def award_emoji_name - note.match(Gitlab::Markdown::EmojiFilter.emoji_pattern)[1] + original_name = note.match(Gitlab::Markdown::EmojiFilter.emoji_pattern)[1] + AwardEmoji.normilize_emoji_name(original_name) end end |