diff options
| author | Valery Sizov <valery@gitlab.com> | 2014-10-24 10:23:38 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2014-10-24 10:23:38 +0000 |
| commit | cc42edfa495703877143abc98c1b6dbf6862aa55 (patch) | |
| tree | 9a505a99da66bb18a30ff11cc5e01cc3be9bf654 | |
| parent | 8a7b864e41ebc93ea4a184734b6458404cc979a5 (diff) | |
| parent | 2bca55197bb195a5b72af7053b31249dc8c921cb (diff) | |
| download | gitlab-ce-cc42edfa495703877143abc98c1b6dbf6862aa55.tar.gz | |
Merge branch 'bump_gitlab_git' into 'master'
Bump gitlab_git to 7.0.0.rc10 (submodules fix)
See merge request !1215
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 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.rc9' +gem "gitlab_git", '7.0.0.rc10' # 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 0e82f14ca9d..314884fa36e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (7.0.0.rc9) + gitlab_git (7.0.0.rc10) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -624,7 +624,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc9) + gitlab_git (= 7.0.0.rc10) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.1.0) gollum-lib (~> 3.0.0) |