summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2016-08-17 16:05:43 +0200
committerAhmad Sherif <me@ahmadsherif.com>2016-08-17 16:15:57 +0200
commit381105a0083dd0fcaf63e61bd70a9a48a4210a60 (patch)
tree58619a6fec6b52e5bbb5d0bd14b2a4f0516a3708
parentd1da2e8180d92e5f4a8b5ebb36b0f4e4d0618bf8 (diff)
downloadgitlab-ce-test-gitlab-git.tar.gz
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock18
2 files changed, 13 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index 8b44b54e22c..2402fa93023 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,7 +53,7 @@ gem 'browser', '~> 2.2'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem 'gitlab_git', '~> 10.4.5'
+gem 'gitlab_git', git: 'https://gitlab.com/gitlab-org/gitlab_git.git', ref: 'fix/remove-unneeded-root-ref-call'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
diff --git a/Gemfile.lock b/Gemfile.lock
index 2244c20203b..54dde2b92d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,14 @@
+GIT
+ remote: https://gitlab.com/gitlab-org/gitlab_git.git
+ revision: fc0ea05f8accd50b94cb954870852f5dcd2866fa
+ ref: fix/remove-unneeded-root-ref-call
+ specs:
+ gitlab_git (10.4.6)
+ activesupport (~> 4.0)
+ charlock_holmes (~> 0.7.3)
+ github-linguist (~> 4.7.0)
+ rugged (~> 0.24.0)
+
GEM
remote: https://rubygems.org/
specs:
@@ -278,11 +289,6 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
- gitlab_git (10.4.5)
- activesupport (~> 4.0)
- charlock_holmes (~> 0.7.3)
- github-linguist (~> 4.7.0)
- rugged (~> 0.24.0)
gitlab_meta (7.0)
gitlab_omniauth-ldap (1.2.1)
net-ldap (~> 0.9)
@@ -855,7 +861,7 @@ DEPENDENCIES
github-linguist (~> 4.7.0)
github-markup (~> 1.4)
gitlab-flowdock-git-hook (~> 1.0.1)
- gitlab_git (~> 10.4.5)
+ gitlab_git!
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.2)