diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-18 23:57:13 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-18 23:57:13 +0000 |
| commit | a27212ab908d5161f5a75b27c4616c11f497f5d4 (patch) | |
| tree | 1ea443ffcba833a262294c232950c15e8cb682a7 /Gemfile | |
| parent | ac828424646e14ec9d2032421c5ada91a8fd7dc9 (diff) | |
| parent | 6a06c5cfb92d7d4e390e63104fd42d24a9159048 (diff) | |
| download | gitlab-ce-a27212ab908d5161f5a75b27c4616c11f497f5d4.tar.gz | |
Merge branch 'cs-gemojione-3' into 'master'
Upgrade gemojione to 3.0.0
Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12
[Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) :tada:
This update has new emoji and more sensical categories.
See merge request !5237
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 'gemojione', '~> 2.6' +gem 'gemojione', '~> 3.0' gem 'gon', '~> 6.0.1' gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-rails', '~> 4.1.0' |