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 /Gemfile | |
| 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 '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' |