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
Showing
... | ... | @@ -223,7 +223,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' |
gem 'addressable', '~> 2.3.8' | ||
gem 'bootstrap-sass', '~> 3.3.0' | ||
gem 'font-awesome-rails', '~> 4.6.1' | ||
gem 'gitlab_emoji', '~> 0.3.0' | ||
gem 'gemojione', '~> 2.6' | ||
gem 'gon', '~> 6.0.1' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | ||
gem 'jquery-rails', '~> 4.1.0' | ||
... | ... |
![app/assets/images/emoji.png](https://lab.node.vifib.com/kirr/gitlab-ce/-/raw/10855e7fff39dbbea791eb1d3b49bb5fc9263455/app/assets/images/emoji.png)
![app/assets/images/emoji@2x.png](https://lab.node.vifib.com/kirr/gitlab-ce/-/raw/10855e7fff39dbbea791eb1d3b49bb5fc9263455/app/assets/images/emoji@2x.png)
This diff is collapsed.
lib/gitlab/emoji.rb
0 → 100644