diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-05 11:10:55 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-05 11:10:55 +0000 |
| commit | 21488c74223524aee9ee6e1fb5274a2d8dec7cb2 (patch) | |
| tree | 950c4f932360f0d4b49299962cc4bd02152a762b /doc/administration | |
| parent | 2dbcb9cb37990c43c2065b3ff26b6564d43cac4c (diff) | |
| parent | 9dde7df2470cc3fe7989de163fe3985d53262a0d (diff) | |
| download | gitlab-ce-21488c74223524aee9ee6e1fb5274a2d8dec7cb2.tar.gz | |
Merge branch 'direct-upload-of-uploads' into 'master'
Allow to store uploads by default on Object Storage
See merge request gitlab-org/gitlab-ce!18156
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/uploads.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/administration/uploads.md b/doc/administration/uploads.md index a82735cc72c..2fa3284b6be 100644 --- a/doc/administration/uploads.md +++ b/doc/administration/uploads.md @@ -65,6 +65,7 @@ For source installations the following settings are nested under `uploads:` and |---------|-------------|---------| | `enabled` | Enable/disable object storage | `false` | | `remote_directory` | The bucket name where Uploads will be stored| | +| `direct_upload` | Set to true to enable direct upload of Uploads without the need of local shared storage. Option may be removed once we decide to support only single storage for all files. This is beta option as it uses inefficient way of uploading data (via Unicorn). The accelerated uploads gonna be implemented in future releases | `false` | | `background_upload` | Set to false to disable automatic upload. Option may be removed once upload is direct to S3 | `true` | | `proxy_download` | Set to true to enable proxying all files served. Option allows to reduce egress traffic as this allows clients to download directly from remote storage instead of proxying all data | `false` | | `connection` | Various connection options described below | | |