diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-06 11:30:17 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-06 11:30:17 +0000 |
| commit | 0cdc2a85c1125afb4aef9781ed6195ab14e3fd5f (patch) | |
| tree | 0c566ba296909d0d31d32d3939f0740091ca798c | |
| parent | 86d5a63e5eed67637e8177082d224935dd10b8f9 (diff) | |
| parent | ce3fb02ea0bab3530bcca116e389c2dd98ba1a68 (diff) | |
| download | gitlab-ce-0cdc2a85c1125afb4aef9781ed6195ab14e3fd5f.tar.gz | |
Merge branch 'gitlab_git_bummp' into 'master'
Gitlab git bump
Fixes #1643
See merge request !1153
| -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.rc8' +gem "gitlab_git", '7.0.0.rc9' # 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 30e89e90d8f..babb23ed606 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.rc8) + gitlab_git (7.0.0.rc9) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -622,7 +622,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc8) + gitlab_git (= 7.0.0.rc9) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.1.0) gollum-lib (~> 3.0.0) |