diff options
author | dixpac <dino.onex@gmail.com> | 2016-07-03 17:04:22 +0300 |
---|---|---|
committer | dixpac <dino.onex@gmail.com> | 2016-07-14 09:51:00 +0300 |
commit | e21492b810bf9cd30f0e60836c056a72e830f427 (patch) | |
tree | af13b1f7482ce738408e396c649134c7fab974f0 /app/models/concerns/awardable.rb | |
parent | 7968484dfa363537e6e7822ca1ec100bcd0ec4f8 (diff) |
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/concerns/awardable.rb')
-rw-r--r-- | app/models/concerns/awardable.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb index 06beff177b1..800a16ab246 100644 --- a/app/models/concerns/awardable.rb +++ b/app/models/concerns/awardable.rb @@ -65,8 +65,7 @@ module Awardable def create_award_emoji(name, current_user) return unless emoji_awardable? - - award_emoji.create(name: name, user: current_user) + award_emoji.create(name: normalize_name(name), user: current_user) end def remove_award_emoji(name, current_user) @@ -80,4 +79,10 @@ module Awardable create_award_emoji(emoji_name, current_user) end end + + private + + def normalize_name(name) + Gitlab::AwardEmoji.normalize_emoji_name(name) + end end |