diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-12 09:23:21 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-12 09:23:21 +0200 |
| commit | 7a4e7ad04e1fc96953d9159e8e1a2208990d34f7 (patch) | |
| tree | b39508df518df88682703b4525f6895113ec4a8a /app/models/note.rb | |
| parent | 2bbe781d8b45fb9677f5fbe60cf86b2452ef3af4 (diff) | |
| download | gitlab-ce-7a4e7ad04e1fc96953d9159e8e1a2208990d34f7.tar.gz | |
Fix tests and wrong choices during merge
Diffstat (limited to 'app/models/note.rb')
| -rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index f9040f9f364..7235274770d 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -343,6 +343,6 @@ class Note < ActiveRecord::Base def award_emoji_name original_name = note.match(Banzai::Filter::EmojiFilter.emoji_pattern)[1] - Gitlab::AwardEmoji.normilize_emoji_name(original_name) + Gitlab::AwardEmoji.normalize_emoji_name(original_name) end end |