summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-09-14 18:10:23 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2015-09-14 18:10:23 +0200
commit0d010088761a0116a5e4317f2dd0c61b510ee1b3 (patch)
tree878d08b90cdaa8ab3b65e062c8318e9f36e0333b
parentb35d5a6a16d3ce390f21459e2989e8c41bce3150 (diff)
downloadgitlab-ce-0d010088761a0116a5e4317f2dd0c61b510ee1b3.tar.gz
Update gitlab_emoji to 0.1.1
-rw-r--r--Gemfile.lock7
1 files changed, 2 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f3091857b7e..29f7213bd67 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,7 +253,7 @@ GEM
ruby-progressbar (~> 1.4)
gemnasium-gitlab-service (0.2.6)
rugged (~> 0.21)
- gemojione (2.0.0)
+ gemojione (2.0.1)
json
gherkin-ruby (0.3.1)
racc
@@ -272,7 +272,7 @@ GEM
charlock_holmes (~> 0.6.6)
escape_utils (~> 0.2.4)
mime-types (~> 1.19)
- gitlab_emoji (0.1.0)
+ gitlab_emoji (0.1.1)
gemojione (~> 2.0)
gitlab_git (7.2.15)
activesupport (~> 4.0)
@@ -889,6 +889,3 @@ DEPENDENCIES
virtus
webmock (~> 1.21.0)
wikicloth (= 0.8.1)
-
-BUNDLED WITH
- 1.10.5