summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-15 15:38:56 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-15 15:38:56 +0300
commit4c26bcbec810e9a621fcf02601189973a50caf76 (patch)
tree1dfd959fda3030ca77c28751f6f783d94daf533c
parentfccc9454ff415a707081f48ec3a50cae4a8b1b4a (diff)
parent1970dabea642c385d77d93b194f9014aacf30ed0 (diff)
downloadgitlab-ce-4c26bcbec810e9a621fcf02601189973a50caf76.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 747dbe1b037..dc00acf6292 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,7 +188,7 @@ GEM
dotenv (>= 0.7)
thor (>= 0.13.6)
formatador (0.2.4)
- gemnasium-gitlab-service (0.2.4)
+ gemnasium-gitlab-service (0.2.6)
rugged (~> 0.21)
gemojione (2.0.0)
json