diff options
author | Connor Shea <connor.james.shea@gmail.com> | 2016-06-25 15:48:12 -0600 |
---|---|---|
committer | Connor Shea <connor.james.shea@gmail.com> | 2016-06-29 14:53:09 -0600 |
commit | f31f78cea32b1650d5cb0a7784a28848b8446e89 (patch) | |
tree | 07996228b1a7fd9e3335a0be680a55c6dc010997 /app/models/award_emoji.rb | |
parent | 84113d7e725dcf6f9a3945853475f0cede957fec (diff) | |
download | gitlab-ce-f31f78cea32b1650d5cb0a7784a28848b8446e89.tar.gz |
Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.update-gemoji
No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier.
Also fix the Rake task and update gemojione to 2.6.1. This adds the EmojiOne Spring update.
Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md
Diffstat (limited to 'app/models/award_emoji.rb')
-rw-r--r-- | app/models/award_emoji.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/award_emoji.rb b/app/models/award_emoji.rb index 59c7d87f5df..46b17479d6d 100644 --- a/app/models/award_emoji.rb +++ b/app/models/award_emoji.rb @@ -8,7 +8,7 @@ class AwardEmoji < ActiveRecord::Base belongs_to :user validates :awardable, :user, presence: true - validates :name, presence: true, inclusion: { in: Emoji.emojis_names } + validates :name, presence: true, inclusion: { in: Gitlab::Emoji.emojis_names } validates :name, uniqueness: { scope: [:user, :awardable_type, :awardable_id] } participant :user |