Commit 5ec0955919326fb6f5a4e46875f0f2143d246a1c
1 parent
6addb15b
Exists in
spb-stable
and in
3 other branches
Use recent gitlab_git lib
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
14 additions
and
6 deletions
Show diff stats
Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth-github' | @@ -29,7 +29,7 @@ gem 'omniauth-github' | ||
29 | 29 | ||
30 | # Extracting information from a git repository | 30 | # Extracting information from a git repository |
31 | # Provide access to Gitlab::Git library | 31 | # Provide access to Gitlab::Git library |
32 | -gem "gitlab_git", "~> 5.0.0" | 32 | +gem "gitlab_git", git: 'https://gitlab.com/gitlab-org/gitlab_git.git', ref: '9c370173c533298664d6dd5b97574c79de705c16' |
33 | 33 | ||
34 | # Ruby/Rack Git Smart-HTTP Server Handler | 34 | # Ruby/Rack Git Smart-HTTP Server Handler |
35 | gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | 35 | gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' |
Gemfile.lock
@@ -5,6 +5,17 @@ GIT | @@ -5,6 +5,17 @@ GIT | ||
5 | specs: | 5 | specs: |
6 | github-markup (0.7.6) | 6 | github-markup (0.7.6) |
7 | 7 | ||
8 | +GIT | ||
9 | + remote: https://gitlab.com/gitlab-org/gitlab_git.git | ||
10 | + revision: 9c370173c533298664d6dd5b97574c79de705c16 | ||
11 | + ref: 9c370173c533298664d6dd5b97574c79de705c16 | ||
12 | + specs: | ||
13 | + gitlab_git (5.1.0.pre) | ||
14 | + activesupport (~> 4.0.0) | ||
15 | + gitlab-grit (~> 2.6.1) | ||
16 | + gitlab-linguist (~> 3.0.0) | ||
17 | + rugged (~> 0.19.0) | ||
18 | + | ||
8 | GEM | 19 | GEM |
9 | remote: https://rubygems.org/ | 20 | remote: https://rubygems.org/ |
10 | specs: | 21 | specs: |
@@ -176,10 +187,6 @@ GEM | @@ -176,10 +187,6 @@ GEM | ||
176 | charlock_holmes (~> 0.6.6) | 187 | charlock_holmes (~> 0.6.6) |
177 | escape_utils (~> 0.2.4) | 188 | escape_utils (~> 0.2.4) |
178 | mime-types (~> 1.19) | 189 | mime-types (~> 1.19) |
179 | - gitlab_git (5.0.0) | ||
180 | - activesupport (~> 4.0.0) | ||
181 | - gitlab-grit (~> 2.6.1) | ||
182 | - gitlab-linguist (~> 3.0.0) | ||
183 | gitlab_meta (6.0) | 190 | gitlab_meta (6.0) |
184 | gitlab_omniauth-ldap (1.0.4) | 191 | gitlab_omniauth-ldap (1.0.4) |
185 | net-ldap (~> 0.3.1) | 192 | net-ldap (~> 0.3.1) |
@@ -417,6 +424,7 @@ GEM | @@ -417,6 +424,7 @@ GEM | ||
417 | ruby-hmac (0.4.0) | 424 | ruby-hmac (0.4.0) |
418 | ruby-progressbar (1.2.0) | 425 | ruby-progressbar (1.2.0) |
419 | rubyntlm (0.1.1) | 426 | rubyntlm (0.1.1) |
427 | + rugged (0.19.0) | ||
420 | safe_yaml (0.9.7) | 428 | safe_yaml (0.9.7) |
421 | sanitize (2.0.6) | 429 | sanitize (2.0.6) |
422 | nokogiri (>= 1.4.4) | 430 | nokogiri (>= 1.4.4) |
@@ -574,7 +582,7 @@ DEPENDENCIES | @@ -574,7 +582,7 @@ DEPENDENCIES | ||
574 | gitlab-gollum-lib (~> 1.1.0) | 582 | gitlab-gollum-lib (~> 1.1.0) |
575 | gitlab-grack (~> 2.0.0.pre) | 583 | gitlab-grack (~> 2.0.0.pre) |
576 | gitlab-linguist (~> 3.0.0) | 584 | gitlab-linguist (~> 3.0.0) |
577 | - gitlab_git (~> 5.0.0) | 585 | + gitlab_git! |
578 | gitlab_meta (= 6.0) | 586 | gitlab_meta (= 6.0) |
579 | gitlab_omniauth-ldap (= 1.0.4) | 587 | gitlab_omniauth-ldap (= 1.0.4) |
580 | gon (~> 5.0.0) | 588 | gon (~> 5.0.0) |