From 33f96e8df089c2291010598c50ec6868ab8cb1ef Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 15 Sep 2021 09:09:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../admin_area/settings/img/user_and_ip_rate_limits.png | Bin 36909 -> 0 bytes .../settings/img/user_and_ip_rate_limits_v14_3.png | Bin 0 -> 29534 bytes doc/user/admin_area/settings/user_and_ip_rate_limits.md | 9 +++++++-- 3 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 doc/user/admin_area/settings/img/user_and_ip_rate_limits.png create mode 100644 doc/user/admin_area/settings/img/user_and_ip_rate_limits_v14_3.png (limited to 'doc/user') diff --git a/doc/user/admin_area/settings/img/user_and_ip_rate_limits.png b/doc/user/admin_area/settings/img/user_and_ip_rate_limits.png deleted file mode 100644 index 5056e8354a9..00000000000 Binary files a/doc/user/admin_area/settings/img/user_and_ip_rate_limits.png and /dev/null differ diff --git a/doc/user/admin_area/settings/img/user_and_ip_rate_limits_v14_3.png b/doc/user/admin_area/settings/img/user_and_ip_rate_limits_v14_3.png new file mode 100644 index 00000000000..36f27c4025a Binary files /dev/null and b/doc/user/admin_area/settings/img/user_and_ip_rate_limits_v14_3.png differ diff --git a/doc/user/admin_area/settings/user_and_ip_rate_limits.md b/doc/user/admin_area/settings/user_and_ip_rate_limits.md index 28c78fd8837..0cf6a0a1b82 100644 --- a/doc/user/admin_area/settings/user_and_ip_rate_limits.md +++ b/doc/user/admin_area/settings/user_and_ip_rate_limits.md @@ -13,7 +13,8 @@ of a web application. For more details, see The following limits are disabled by default: -- Unauthenticated requests +- Unauthenticated API requests +- Unauthenticated web requests - Authenticated API requests - Authenticated web requests @@ -21,7 +22,7 @@ To enforce any or all of them: 1. On the top bar, select **Menu > Admin**. 1. On the left sidebar, select **Settings > Network**, and expand **User and IP rate limits**: - ![user-and-ip-rate-limits](img/user_and_ip_rate_limits.png) + ![user-and-ip-rate-limits](img/user_and_ip_rate_limits_v14_3.png) NOTE: By default, all Git operations are first tried unauthenticated. Because of this, HTTP Git operations @@ -129,6 +130,10 @@ a comma-separated list of throttle names. The possible names are: - `throttle_unauthenticated` + - [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/335300) in GitLab 14.3. Use `throttle_unauthenticated_api` or `throttle_unauthenticated_web` instead. + `throttle_unauthenticated` is still supported and selects both of them. +- `throttle_unauthenticated_api` +- `throttle_unauthenticated_web` - `throttle_authenticated_api` - `throttle_authenticated_web` - `throttle_unauthenticated_protected_paths` -- cgit v1.2.3