diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-05 20:59:40 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-05 20:59:40 +0000 |
commit | dd271e246001a06609592eef109d154291305d32 (patch) | |
tree | 279ef8877a1a7507d26c042810410f6362114e35 /doc | |
parent | e9e800f5239f5b45984d49615bbc67e823a117ab (diff) | |
parent | 678620cce67cc283b19b75137f747f9415aaf942 (diff) | |
download | gitlab-ce-dd271e246001a06609592eef109d154291305d32.tar.gz |
Merge branch 'direct-upload-of-artifacts' into 'master'
Direct upload of artifacts
See merge request gitlab-org/gitlab-ce!18160
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/job_artifacts.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md index ac3a12930c3..896cb93e5ed 100644 --- a/doc/administration/job_artifacts.md +++ b/doc/administration/job_artifacts.md @@ -108,6 +108,7 @@ For source installations the following settings are nested under `artifacts:` an |---------|-------------|---------| | `enabled` | Enable/disable object storage | `false` | | `remote_directory` | The bucket name where Artfacts will be stored| | +| `direct_upload` | Set to true to enable direct upload of Artifacts without the need of local shared storage. Option may be removed once we decide to support only single storage for all files. Currently only `Google` provider is supported | `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 | | |