diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:43:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:43:14 +0000 |
| commit | 4b28f2d999eeb936e2e3718e5ea25d3b1020291e (patch) | |
| tree | 0fc97fe63d39463e4dfd40c5a08847ac227fbfde /Gemfile.lock | |
| parent | daccc54d25a5acfd089e02fd7387ed14f0a3a629 (diff) | |
| parent | c993481d991333fe0750080eec98fd2e9eeda8d5 (diff) | |
| download | gitlab-ce-4b28f2d999eeb936e2e3718e5ea25d3b1020291e.tar.gz | |
Merge branch 'git-archive-golang' into 'master'
Let gitlab-git-http-server handle archive downloads
This change relies on changes in gitlab_git and gitlab-git-http-server.
fixes #2429
See merge request !1548
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 403d7095197..ee545f366f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,7 +278,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.1) gemojione (~> 2.0) - gitlab_git (7.2.18) + gitlab_git (7.2.19) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -815,7 +815,7 @@ DEPENDENCIES gitlab-flowdock-git-hook (~> 1.0.1) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.2.18) + gitlab_git (~> 7.2.19) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.0.2) |