diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 21:06:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 21:06:42 +0000 |
| commit | d5e0416021aa6de53b89f9d415f368226d9326e5 (patch) | |
| tree | 9a3e3bd6d1aac10cfde7f0079f784a489491a48b /doc/api/settings.md | |
| parent | 24fe7aa2aa199b2aace0cfec26d744f51d7e2167 (diff) | |
| download | gitlab-ce-d5e0416021aa6de53b89f9d415f368226d9326e5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/settings.md')
| -rw-r--r-- | doc/api/settings.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 2d9e435bbb6..c650c31eb41 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -257,7 +257,6 @@ are listed in the descriptions of the relevant settings. | `housekeeping_incremental_repack_period` | integer | required by: `housekeeping_enabled` | Number of Git pushes after which an incremental `git repack` is run. | | `html_emails_enabled` | boolean | no | Enable HTML emails. | | `import_sources` | array of strings | no | Sources to allow project import from, possible values: `github`, `bitbucket`, `bitbucket_server`, `gitlab`, `google_code`, `fogbugz`, `git`, `gitlab_project`, `gitea`, `manifest`, and `phabricator`. | - | `instance_statistics_visibility_private` | boolean | no | When set to `true` Instance statistics will only be available to admins. | | `local_markdown_version` | integer | no | Increase this value when any cached markdown should be invalidated. | | `max_artifacts_size` | integer | no | Maximum artifacts size in MB | @@ -317,6 +316,8 @@ are listed in the descriptions of the relevant settings. | `snowplow_cookie_domain` | string | no | The Snowplow cookie domain. (e.g. `.gitlab.com`) | | `snowplow_enabled` | boolean | no | Enable snowplow tracking. | | `snowplow_site_id` | string | no | The Snowplow site name / application id. (e.g. `gitlab`) | +| `pendo_url` | string | required by: `pendo_enabled` | The Pendo endpoint url with js snippet. (e.g. `https://cdn.pendo.io/agent/static/your-api-key/pendo.js`) | +| `pendo_enabled` | boolean | no | Enable pendo tracking. | | `terminal_max_session_time` | integer | no | Maximum time for web terminal websocket connection (in seconds). Set to `0` for unlimited time. | | `terms` | text | required by: `enforce_terms` | (**Required by:** `enforce_terms`) Markdown content for the ToS. | | `throttle_authenticated_api_enabled` | boolean | no | (**If enabled, requires:** `throttle_authenticated_api_period_in_seconds` and `throttle_authenticated_api_requests_per_period`) Enable authenticated API request rate limit. Helps reduce request volume (e.g. from crawlers or abusive bots). | |