diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2019-09-02 05:35:06 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-09-02 05:35:06 +0300 |
| commit | 70a16ebc9751d7aca7d4293894409036b53b5d0d (patch) | |
| tree | c717d1b6695990de40ff4c56eb6891d808300edf /doc/security | |
| parent | 22e765b2ccea5ce5a5d3f284f7ce76e868296a42 (diff) | |
Realign 3 docs that diverged between ce/ee
Diffstat (limited to 'doc/security')
| -rw-r--r-- | doc/security/asset_proxy.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/security/asset_proxy.md b/doc/security/asset_proxy.md index f25910d3db7..6a2341c28c8 100644 --- a/doc/security/asset_proxy.md +++ b/doc/security/asset_proxy.md @@ -16,12 +16,12 @@ of your Camo server. Once you have your Camo server up and running, you can configure GitLab to proxy image requests to it. The following settings are supported: -| Attribute | Description | -| ------------------------ | ----------- | -| `asset_proxy_enabled` | (**If enabled, requires:** `asset_proxy_url`) Enable proxying of assets. | -| `asset_proxy_secret_key` | Shared secret with the asset proxy server. | -| `asset_proxy_url` | URL of the asset proxy server. | -| `asset_proxy_whitelist` | Assets that match these domain(s) will NOT be proxied. Wildcards allowed. Your GitLab installation URL is automatically whitelisted. | +| Attribute | Description | +| ------------------------- | ----------- | +| `asset_proxy_enabled` | (**If enabled, requires:** `asset_proxy_url`) Enable proxying of assets. | +| `asset_proxy_secret_key` | Shared secret with the asset proxy server. | +| `asset_proxy_url` | URL of the asset proxy server. | +| `asset_proxy_whitelist` | Assets that match these domain(s) will NOT be proxied. Wildcards allowed. Your GitLab installation URL is automatically whitelisted. | These can be set via the [Application setting API](../api/settings.md) |