summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-06-22 21:06:49 +0200
committerJan Provaznik <jprovaznik@gitlab.com>2018-06-22 21:06:49 +0200
commitad086fa8d8278f9e2d88b8c8357b7ab5e7a5879b (patch)
treee5d74b3f7ca4a445b7590eb3c5382f085dbdb808
parent656d4ebf67b597e012f97edd04432e402d26fbc2 (diff)
downloadgitlab-ce-jprovazn-direct-upload.tar.gz
-rw-r--r--doc/administration/uploads.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/uploads.md b/doc/administration/uploads.md
index b7f747d4286..dfe881bb39e 100644
--- a/doc/administration/uploads.md
+++ b/doc/administration/uploads.md
@@ -66,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. If enabled Workhorse uploads files directly to the object storage | `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 | |