diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-04-17 10:30:49 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-04-17 10:30:49 +0000 |
| commit | cfa5c30792ced178e53d1f7782ae027204ce8821 (patch) | |
| tree | 31e7251dd6d2a57739ce6544ca5131955ef7f612 /app/models | |
| parent | 128f91fce7a62c7f6c444e670a00294ce1b777a1 (diff) | |
| parent | e052d49a4c342624d5f6c6a7e1354ea6a8003d05 (diff) | |
| download | gitlab-ce-cfa5c30792ced178e53d1f7782ae027204ce8821.tar.gz | |
Merge branch '24704-restore-download-repository-path' into 'master'
Restore "download repository path" feature, now with fixes and a feature flag
Closes gitlab-workhorse#218 and #24704
See merge request gitlab-org/gitlab-ce!27275
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/repository.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 574ce12b309..51ab2247a03 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -299,13 +299,14 @@ class Repository end end - def archive_metadata(ref, storage_path, format = "tar.gz", append_sha:) + def archive_metadata(ref, storage_path, format = "tar.gz", append_sha:, path: nil) raw_repository.archive_metadata( ref, storage_path, project.path, format, - append_sha: append_sha + append_sha: append_sha, + path: path ) end |