diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-18 16:35:32 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-18 16:35:32 +0000 |
| commit | 4c5cc19844600ca7624c3c7205495fcf043412a5 (patch) | |
| tree | 645ae2d33ece61453c81cf01cc5e97662e0c40fe | |
| parent | 435128171ddf41025f410429b8a639a368e77582 (diff) | |
| parent | 7fb3b908ed825282a2b540e514a92a6cd8e267c5 (diff) | |
| download | gitlab-ce-4c5cc19844600ca7624c3c7205495fcf043412a5.tar.gz | |
Merge branch 'bump-gitlab_git' into 'master'
Bump gitlab git
See merge request !1261
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -31,7 +31,7 @@ gem 'omniauth-shibboleth' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '7.0.0.rc11' +gem "gitlab_git", '7.0.0.rc12' # 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 a3645f7bbec..938ce560620 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,11 +179,11 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (7.0.0.rc11) + gitlab_git (7.0.0.rc12) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) - rugged (~> 0.21.0) + rugged (~> 0.21.2) gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.0) net-ldap (~> 0.9) @@ -447,7 +447,7 @@ GEM ruby-progressbar (1.2.0) rubyntlm (0.4.0) rubypants (0.2.0) - rugged (0.21.0) + rugged (0.21.2) safe_yaml (0.9.7) sanitize (2.1.0) nokogiri (>= 1.4.4) @@ -625,7 +625,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc11) + gitlab_git (= 7.0.0.rc12) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.0) gollum-lib (~> 3.0.0) |