diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-03-06 11:59:26 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-03-06 15:19:33 -0600 |
| commit | 96cbad23378e492f2564a8ec4121b7b3548a7df3 (patch) | |
| tree | 1f39f33940e914965d2f288f7f4d99fd592acd1d /app | |
| parent | f602efea65c2a816c7e29be546d2eb412fe538cc (diff) | |
| download | gitlab-ce-96cbad23378e492f2564a8ec4121b7b3548a7df3.tar.gz | |
Fix up @DouweM review
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/copy_as_gfm.js | 3 | ||||
| -rw-r--r-- | app/models/concerns/awardable.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/copy_as_gfm.js b/app/assets/javascripts/copy_as_gfm.js index 7e63d6ea07b..ba8ed19e9da 100644 --- a/app/assets/javascripts/copy_as_gfm.js +++ b/app/assets/javascripts/copy_as_gfm.js @@ -46,6 +46,9 @@ require('./lib/utils/common_utils'); }, }, EmojiFilter: { + 'img.emoji'(el, text) { + return el.getAttribute('alt'); + }, 'gl-emoji'(el, text) { return `:${el.getAttribute('data-name')}:`; }, diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb index 073ac4c1b65..a7fd0a15f0f 100644 --- a/app/models/concerns/awardable.rb +++ b/app/models/concerns/awardable.rb @@ -101,6 +101,6 @@ module Awardable private def normalize_name(name) - Gitlab::AwardEmoji.normalize_emoji_name(name) + Gitlab::Emoji.normalize_emoji_name(name) end end |