diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-03 18:12:51 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-03 18:12:51 +0200 |
| commit | 5ec0955919326fb6f5a4e46875f0f2143d246a1c (patch) | |
| tree | 7355ab13ed81f1c97115913f83885ea65ea35b00 /Gemfile.lock | |
| parent | 6addb15b15f3d59469d7569271b6449a2a164b87 (diff) | |
| download | gitlab-ce-5ec0955919326fb6f5a4e46875f0f2143d246a1c.tar.gz | |
Use recent gitlab_git lib
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 13 insertions, 5 deletions
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) |