diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-09 09:16:06 -0500 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-09 09:16:06 -0500 |
| commit | fc6587f1f21c97fa19e3ae7eaac4e9add7b107b8 (patch) | |
| tree | d83947812fb500e5f437a0d672901861dae5a13e /app/uploaders | |
| parent | 6466739e2e61f790a9e1f09020dba710c4078a0f (diff) | |
| download | gitlab-ce-fc6587f1f21c97fa19e3ae7eaac4e9add7b107b8.tar.gz | |
Add proxy_download to perform proxied sending of all files
Diffstat (limited to 'app/uploaders')
| -rw-r--r-- | app/uploaders/object_storage.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index 1880cd100dc..132d78607d6 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -127,6 +127,14 @@ module ObjectStorage object_store_options.background_upload end + def proxy_download_enabled? + object_store_options.proxy_download + end + + def direct_download_enabled? + !proxy_download_enabled? + end + def object_store_credentials object_store_options.connection.to_hash.deep_symbolize_keys end |