diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-07-06 08:38:24 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-07-06 08:38:24 +0300 |
| commit | 25bd5413200c9cd9368c753e2752f07735604547 (patch) | |
| tree | c4cc75a53face6a6d0da8adca9a3994d3cc688b5 /doc/administration | |
| parent | b025e89e08888f3b393108f984a25c209526491b (diff) | |
| parent | 969b7c565c6fe5cdfc54830d1da35f254ddaf530 (diff) | |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/uploads.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/administration/uploads.md b/doc/administration/uploads.md index 6688181c5a8..85eca403253 100644 --- a/doc/administration/uploads.md +++ b/doc/administration/uploads.md @@ -52,6 +52,7 @@ _The uploads are stored by default in >**Notes:** - [Introduced][ee-3867] in [GitLab Enterprise Edition Premium][eep] 10.5. +- Since version 11.1, we support direct_upload to S3. If you don't want to use the local disk where GitLab is installed to store the uploads, you can use an object storage provider like AWS S3 instead. @@ -65,7 +66,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` | +| `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. | `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 | | |