summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-12-05 17:49:32 -0500
committerRobert Speicher <rspeicher@gmail.com>2015-12-05 17:49:32 -0500
commit6ee43ada3a68407affd9e73ff4f1d5f9665da2d4 (patch)
tree1dc3d933f0a650a947965ba4d538cfdb783c141e /Gemfile.lock
parentd2f9a9012d55a7dc9c8e9e61b946c52836a1d8f1 (diff)
downloadgitlab-ce-6ee43ada3a68407affd9e73ff4f1d5f9665da2d4.tar.gz
Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emoji
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index cd1855758b2..7eaa0d2c841 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -864,7 +864,7 @@ DEPENDENCIES
github-linguist (~> 4.7.0)
github-markup (~> 1.3.1)
gitlab-flowdock-git-hook (~> 1.0.1)
- gitlab_emoji (~> 0.1)
+ gitlab_emoji (~> 0.2.0)
gitlab_git (~> 7.2.20)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1)