diff options
| author | Evan Read <eread@gitlab.com> | 2019-09-02 02:35:07 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-09-02 02:35:07 +0000 |
| commit | 60adc14473911fd9bd33feef2fbfd62a9824a11c (patch) | |
| tree | c717d1b6695990de40ff4c56eb6891d808300edf | |
| parent | 22e765b2ccea5ce5a5d3f284f7ce76e868296a42 (diff) | |
| parent | 70a16ebc9751d7aca7d4293894409036b53b5d0d (diff) | |
| download | gitlab-ce-60adc14473911fd9bd33feef2fbfd62a9824a11c.tar.gz | |
Merge branch 'docs-align-for-single-codebase' into 'master'
Realign 3 docs that diverged between ce/ee
See merge request gitlab-org/gitlab-ce!32513
| -rw-r--r-- | doc/api/epics.md | 2 | ||||
| -rw-r--r-- | doc/api/settings.md | 2 | ||||
| -rw-r--r-- | doc/security/asset_proxy.md | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/doc/api/epics.md b/doc/api/epics.md index 08eb84bfb63..675b88649e0 100644 --- a/doc/api/epics.md +++ b/doc/api/epics.md @@ -231,7 +231,7 @@ PUT /groups/:id/epics/:epic_iid | `id` | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user | | `epic_iid` | integer/string | yes | The internal ID of the epic | | `title` | string | no | The title of an epic | -| `description` | string | no | The description of an epic. Limited to 1 000 000 characters. | +| `description` | string | no | The description of an epic. Limited to 1 000 000 characters. | | `labels` | string | no | The comma separated list of labels | | `start_date_is_fixed` | boolean | no | Whether start date should be sourced from `start_date_fixed` or from milestones (since 11.3) | | `start_date_fixed` | string | no | The fixed start date of an epic (since 11.3) | diff --git a/doc/api/settings.md b/doc/api/settings.md index 6cf06bde575..a14b0d3632a 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -67,7 +67,7 @@ Example response: "local_markdown_version": 0, "allow_local_requests_from_hooks_and_services": true, "allow_local_requests_from_web_hooks_and_services": true, - "allow_local_requests_from_system_hooks": false + "allow_local_requests_from_system_hooks": false, "asset_proxy_enabled": true, "asset_proxy_url": "https://assets.example.com", "asset_proxy_whitelist": ["example.com", "*.example.com", "your-instance.com"] 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) |