diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-22 18:10:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-22 18:10:48 +0300 |
commit | 232e7582b0e81e95bd721ad8094fcb50ecbc8a04 (patch) | |
tree | a68e00760d0a3446c2030addd679b33acfa39d2d /doc/api/settings.md | |
parent | 980d813e90c70f09861e39b9269e73b2c9a4e936 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/settings.md')
-rw-r--r-- | doc/api/settings.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 2fd58917aad..53cb1335a54 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -305,6 +305,7 @@ 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`, `fogbugz`, `git`, `gitlab_project`, `gitea`, `manifest`, and `phabricator`. | +| `in_product_marketing_emails_enabled` | boolean | no | Enable in-product marketing emails. Enabled by default. | | `invisible_captcha_enabled` | boolean | no | <!-- vale gitlab.Spelling = NO --> Enable Invisible Captcha <!-- vale gitlab.Spelling = YES --> spam detection during sign-up. Disabled by default. | | `issues_create_limit` | integer | no | Max number of issue creation requests per minute per user. Disabled by default.| | `local_markdown_version` | integer | no | Increase this value when any cached Markdown should be invalidated. | |