summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-18 23:57:13 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-18 23:57:13 +0000
commita27212ab908d5161f5a75b27c4616c11f497f5d4 (patch)
tree1ea443ffcba833a262294c232950c15e8cb682a7 /Gemfile.lock
parentac828424646e14ec9d2032421c5ada91a8fd7dc9 (diff)
parent6a06c5cfb92d7d4e390e63104fd42d24a9159048 (diff)
downloadgitlab-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.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f3f4d895ae4..4bb7a8d0604 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)
@@ -860,7 +860,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)