summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-03 18:12:51 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-03 18:12:51 +0200
commit5ec0955919326fb6f5a4e46875f0f2143d246a1c (patch)
tree7355ab13ed81f1c97115913f83885ea65ea35b00
parent6addb15b15f3d59469d7569271b6449a2a164b87 (diff)
downloadgitlab-ce-5ec0955919326fb6f5a4e46875f0f2143d246a1c.tar.gz
Use recent gitlab_git lib
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock18
2 files changed, 14 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 87fb9bbda41..669cbcbede3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth-github'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem "gitlab_git", "~> 5.0.0"
+gem "gitlab_git", git: 'https://gitlab.com/gitlab-org/gitlab_git.git', ref: '9c370173c533298664d6dd5b97574c79de705c16'
# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f677377291..47a189cbe77 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,6 +5,17 @@ GIT
specs:
github-markup (0.7.6)
+GIT
+ remote: https://gitlab.com/gitlab-org/gitlab_git.git
+ revision: 9c370173c533298664d6dd5b97574c79de705c16
+ ref: 9c370173c533298664d6dd5b97574c79de705c16
+ specs:
+ gitlab_git (5.1.0.pre)
+ activesupport (~> 4.0.0)
+ gitlab-grit (~> 2.6.1)
+ gitlab-linguist (~> 3.0.0)
+ rugged (~> 0.19.0)
+
GEM
remote: https://rubygems.org/
specs:
@@ -176,10 +187,6 @@ GEM
charlock_holmes (~> 0.6.6)
escape_utils (~> 0.2.4)
mime-types (~> 1.19)
- gitlab_git (5.0.0)
- activesupport (~> 4.0.0)
- gitlab-grit (~> 2.6.1)
- gitlab-linguist (~> 3.0.0)
gitlab_meta (6.0)
gitlab_omniauth-ldap (1.0.4)
net-ldap (~> 0.3.1)
@@ -417,6 +424,7 @@ GEM
ruby-hmac (0.4.0)
ruby-progressbar (1.2.0)
rubyntlm (0.1.1)
+ rugged (0.19.0)
safe_yaml (0.9.7)
sanitize (2.0.6)
nokogiri (>= 1.4.4)
@@ -574,7 +582,7 @@ DEPENDENCIES
gitlab-gollum-lib (~> 1.1.0)
gitlab-grack (~> 2.0.0.pre)
gitlab-linguist (~> 3.0.0)
- gitlab_git (~> 5.0.0)
+ gitlab_git!
gitlab_meta (= 6.0)
gitlab_omniauth-ldap (= 1.0.4)
gon (~> 5.0.0)