diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-05 11:42:20 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-05 11:42:20 +0300 |
| commit | e11a1001dcdc1ea5c65845fb0897b861b5c0b92d (patch) | |
| tree | 27932bbdd58a1322b6b2c3fd82738c8330ecdec2 /doc | |
| parent | 8576e45f28737f1e9f6b0b6e5649745c76751b06 (diff) | |
| parent | eea26a93e7d4ac0c6fefe46592c9baa0d3e6a5cd (diff) | |
Merge branch 'presigned-multipart-uploads' into 'master'
Support presigned multipart uploads
See merge request gitlab-org/gitlab-ce!18855
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/job_artifacts.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md index 77fe4d561a1..e59ab5a72e1 100644 --- a/doc/administration/job_artifacts.md +++ b/doc/administration/job_artifacts.md @@ -94,6 +94,7 @@ _The artifacts are stored by default in > Available in [GitLab Premium](https://about.gitlab.com/products/) and [GitLab.com Silver](https://about.gitlab.com/gitlab-com/). > Since version 10.6, available in [GitLab CE](https://about.gitlab.com/products/) +> Since version 11.0, we support direct_upload to S3. If you don't want to use the local disk where GitLab is installed to store the artifacts, you can use an object storage like AWS S3 instead. @@ -108,7 +109,7 @@ For source installations the following settings are nested under `artifacts:` an |---------|-------------|---------| | `enabled` | Enable/disable object storage | `false` | | `remote_directory` | The bucket name where Artifacts 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` | +| `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. | `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 | | |