diff options
author | Robert Speicher <robert@gitlab.com> | 2016-07-05 17:08:35 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-07-05 17:08:35 +0000 |
commit | aefb8a1741b58a10832e63c73210b8608c2be753 (patch) | |
tree | 48d9f59a52c8bf0c102f6e1e4d9ecbf36a6dd025 /Gemfile | |
parent | 10855e7fff39dbbea791eb1d3b49bb5fc9263455 (diff) | |
parent | f31f78cea32b1650d5cb0a7784a28848b8446e89 (diff) | |
download | gitlab-ce-aefb8a1741b58a10832e63c73210b8608c2be753.tar.gz |
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 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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' |