summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-13 08:43:42 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-18 10:40:16 -0600
commit6a06c5cfb92d7d4e390e63104fd42d24a9159048 (patch)
treec4c2697d47e403699fa973f9f5bc795238f51ac3 /Gemfile
parent08264f4334ff48d1274f066cd5b03455bc4befdf (diff)
downloadgitlab-ce-6a06c5cfb92d7d4e390e63104fd42d24a9159048.tar.gz
Upgrade Gemojione from 2.6.1 to 3.0.1.
This adds the 2016 emoji as well as support for using SVG images instead of PNGs. It also fixes a number of incorrectly categorized emoji and other minor issues. Upgrade Rake task for Gemojione 3.0.0 and generate sprites. Upgrade aliases.json by pulling down index.json from the gemojione repository and running the generate_aliases.rb file. Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md#v301-2016-07-16 For the specific emoji added to the Unicode standard, see: http://emojione.com/releases/2.2.4/ Huge kudos to Jonathan Wiesel (@jonathanwiesel) for his work on the gemojione gem!
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 81e8ff60ad5..5b19d2bae7d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'