diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-06 14:14:39 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-06 14:14:39 +0000 |
| commit | 44f4a674e2a87d104f700265d835aba000c589f0 (patch) | |
| tree | 1766e8c5a220fed40333c42e8db8ee02494da224 /lib/gitlab/workhorse.rb | |
| parent | fe17613dec7ce0c97ca2c487f27352532968f757 (diff) | |
| parent | 07f517d441ab8782286b4a59d56a630393d75e16 (diff) | |
| download | gitlab-ce-44f4a674e2a87d104f700265d835aba000c589f0.tar.gz | |
Merge branch 'jramsay-38830-tarball' into 'master'
Add alternative archive route
Closes #38830
See merge request gitlab-org/gitlab-ce!17225
Diffstat (limited to 'lib/gitlab/workhorse.rb')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 2faeaf16d55..153cb2a8bb1 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -59,10 +59,10 @@ module Gitlab ] end - def send_git_archive(repository, ref:, format:) + def send_git_archive(repository, ref:, format:, append_sha:) format ||= 'tar.gz' format.downcase! - params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format) + params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format, append_sha: append_sha) raise "Repository or ref not found" if params.empty? if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) |