diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-05 20:08:35 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-05 20:08:35 +0300 |
| commit | aefb8a1741b58a10832e63c73210b8608c2be753 (patch) | |
| tree | 48d9f59a52c8bf0c102f6e1e4d9ecbf36a6dd025 /app | |
| parent | 10855e7fff39dbbea791eb1d3b49bb5fc9263455 (diff) | |
| parent | f31f78cea32b1650d5cb0a7784a28848b8446e89 (diff) | |
Merge branch 'update-gemoji' into 'master'
Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione
- 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. Unless there's a particularly good reason we were using the gem?
- Fixes the Rake task since it broke after all the AwardEmoji changes.
- Update gemojione to 2.6.1.
Spring Update changes! http://emojione.com/releases/#2.2.0
See merge request !4919
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/images/emoji.png | bin | 263346 -> 1025831 bytes | |||
| -rw-r--r-- | app/assets/images/emoji@2x.png | bin | 689076 -> 2492919 bytes | |||
| -rw-r--r-- | app/helpers/issues_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/award_emoji.rb | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/images/emoji.png b/app/assets/images/emoji.png Binary files differindex 99093d4725a..6bacb0e92b6 100644 --- a/app/assets/images/emoji.png +++ b/app/assets/images/emoji.png diff --git a/app/assets/images/emoji@2x.png b/app/assets/images/emoji@2x.png Binary files differindex 48989942a9f..99588b56616 100644 --- a/app/assets/images/emoji@2x.png +++ b/app/assets/images/emoji@2x.png diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 72bd1fbbd81..2b0defd1dda 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -118,7 +118,7 @@ module IssuesHelper end def emoji_icon(name, unicode = nil, aliases = [], sprite: true) - unicode ||= Emoji.emoji_filename(name) rescue "" + unicode ||= Gitlab::Emoji.emoji_filename(name) rescue "" data = { aliases: aliases.join(" "), 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 |
