summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-08-31 15:51:41 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-08-31 15:51:41 +0200
commit90b1ecfa011d31c0f24cfcbb94a7b184e485e4fd (patch)
tree2dbf5766a07e18184f61f0aa0c885fb2b388e866 /Gemfile.lock
parent4027a26e7b5a1a2a54dd57e480507095c91af26b (diff)
parente334ec0683b77f46f19e1474289a9edfd2fb8c13 (diff)
downloadgitlab-ce-90b1ecfa011d31c0f24cfcbb94a7b184e485e4fd.tar.gz
Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server
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 bedcf9c85b0..d09bc53e379 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,7 +274,7 @@ GEM
mime-types (~> 1.19)
gitlab_emoji (0.1.0)
gemojione (~> 2.0)
- gitlab_git (7.2.14)
+ gitlab_git (7.2.15)
activesupport (~> 4.0)
charlock_holmes (~> 0.6)
gitlab-linguist (~> 3.0)
@@ -787,7 +787,7 @@ DEPENDENCIES
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-linguist (~> 3.0.1)
gitlab_emoji (~> 0.1)
- gitlab_git (~> 7.2.14)
+ gitlab_git (~> 7.2.15)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (= 1.2.1)
gollum-lib (~> 4.0.2)