summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-29 14:54:13 +0200
committerDouwe Maan <douwe@gitlab.com>2015-10-01 12:24:08 +0200
commitb7629a53272bbd4bcd2fe4f98a6c2a7e28534089 (patch)
tree180defa9077f8ec59942dff04f1581587d84756a
parent10c036fcf59297663fd1121f7b48d1a289a2e312 (diff)
downloadgitlab-ce-b7629a53272bbd4bcd2fe4f98a6c2a7e28534089.tar.gz
Update gitlab_git to 7.2.17.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock7
2 files changed, 6 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 6950091b2b0..f1674c560e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,7 @@ gem "browser", '~> 1.0.0'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 7.2.15'
+gem "gitlab_git", '~> 7.2.17'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
diff --git a/Gemfile.lock b/Gemfile.lock
index 4386c6b9abb..6472221bc54 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -278,7 +278,7 @@ GEM
mime-types (~> 1.19)
gitlab_emoji (0.1.1)
gemojione (~> 2.0)
- gitlab_git (7.2.15)
+ gitlab_git (7.2.17)
activesupport (~> 4.0)
charlock_holmes (~> 0.6)
gitlab-linguist (~> 3.0)
@@ -834,7 +834,7 @@ DEPENDENCIES
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-linguist (~> 3.0.1)
gitlab_emoji (~> 0.1)
- gitlab_git (~> 7.2.15)
+ gitlab_git (~> 7.2.17)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.0.2)
@@ -937,3 +937,6 @@ DEPENDENCIES
webmock (~> 1.21.0)
whenever (~> 0.8.4)
wikicloth (= 0.8.1)
+
+BUNDLED WITH
+ 1.10.6