summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-02 12:11:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-02 12:11:04 +0000
commited509186782d16d2bbcb34ac73303e8cb3a9d5a2 (patch)
tree4ab3bbb33b37e9e4c0f73627617ea6b0c7d0d7f7 /doc/api
parent44837830832a41a6fe6360aca18e50826c723fd1 (diff)
downloadgitlab-ce-ed509186782d16d2bbcb34ac73303e8cb3a9d5a2.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/settings.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md
index 3d8d02b8429..249891cb8e0 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -295,6 +295,7 @@ listed in the descriptions of the relevant settings.
| `diff_max_patch_bytes` | integer | no | Maximum [diff patch size](../user/admin_area/diff_limits.md), in bytes. |
| `diff_max_files` | integer | no | Maximum [files in a diff](../user/admin_area/diff_limits.md). |
| `diff_max_lines` | integer | no | Maximum [lines in a diff](../user/admin_area/diff_limits.md). |
+| `disable_admin_oauth_scopes` | boolean | no | Stops administrators from connecting their GitLab accounts to non-trusted OAuth 2.0 applications that have the `api`, `read_api`, `read_repository`, `write_repository`, `read_registry`, `write_registry`, or `sudo` scopes. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/375043) in GitLab 15.6. |
| `disable_feed_token` | boolean | no | Disable display of RSS/Atom and calendar feed tokens. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/231493) in GitLab 13.7. |
| `disabled_oauth_sign_in_sources` | array of strings | no | Disabled OAuth sign-in sources. |
| `dns_rebinding_protection_enabled` | boolean | no | Enforce DNS rebinding attack protection. |