diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-07-13 08:43:42 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-07-18 10:40:16 -0600 |
| commit | 6a06c5cfb92d7d4e390e63104fd42d24a9159048 (patch) | |
| tree | c4c2697d47e403699fa973f9f5bc795238f51ac3 /Gemfile.lock | |
| parent | 08264f4334ff48d1274f066cd5b03455bc4befdf (diff) | |
| download | gitlab-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.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0987fd5665a..f98b01c15a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -255,7 +255,7 @@ GEM ruby-progressbar (~> 1.4) gemnasium-gitlab-service (0.2.6) rugged (~> 0.21) - gemojione (2.6.1) + gemojione (3.0.1) json get_process_mem (0.2.0) gherkin-ruby (0.3.2) @@ -857,7 +857,7 @@ DEPENDENCIES foreman (~> 0.78.0) fuubar (~> 2.0.0) gemnasium-gitlab-service (~> 0.2) - gemojione (~> 2.6) + gemojione (~> 3.0) github-linguist (~> 4.7.0) github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) |