diff options
| author | Michael Kozono <mkozono@gmail.com> | 2019-08-28 16:39:32 +0000 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2019-08-28 16:39:32 +0000 |
| commit | 628507e2662c21dfbd6efe11a607a4ee6f8ac4c0 (patch) | |
| tree | d55657855170d35913742cf6109ce0e6bfcefbe5 | |
| parent | 68a04e560391ed0f24641ddf71db2a09f2b26d54 (diff) | |
| parent | 46f7674733c6289e7ced13fb86f66de792ff5eac (diff) | |
| download | gitlab-ce-628507e2662c21dfbd6efe11a607a4ee6f8ac4c0.tar.gz | |
Merge branch 'docs/edit-limit-text' into 'master'
Edit limit text
See merge request gitlab-org/gitlab-ce!32318
| -rw-r--r-- | doc/security/rack_attack.md | 9 | ||||
| -rw-r--r-- | doc/user/gitlab_com/index.md | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/doc/security/rack_attack.md b/doc/security/rack_attack.md index 4ad5fd0d16c..09d29bf3446 100644 --- a/doc/security/rack_attack.md +++ b/doc/security/rack_attack.md @@ -77,11 +77,12 @@ authentication requests were received in a 3-minute period from a single IP addr This applies only to Git requests and container registry (`/jwt/auth`) requests (combined). -This limit is reset by requests that authenticate successfully. For example, 29 -failed authentication requests followed by 1 successful request, followed by 29 -more failed authentication requests would not trigger a ban. +This limit: -JWT requests authenticated by gitlab-ci-token are excluded from this limit. +- Is reset by requests that authenticate successfully. For example, 29 + failed authentication requests followed by 1 successful request, followed by 29 + more failed authentication requests would not trigger a ban. +- Does not apply to JWT requests authenticated by `gitlab-ci-token`. No response headers are provided. diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md index 8f1048260f2..72beb38fe76 100644 --- a/doc/user/gitlab_com/index.md +++ b/doc/user/gitlab_com/index.md @@ -320,11 +320,12 @@ authentication requests were received in a 3-minute period from a single IP addr This applies only to Git requests and container registry (`/jwt/auth`) requests (combined). -This limit is reset by requests that authenticate successfully. For example, 29 -failed authentication requests followed by 1 successful request, followed by 29 -more failed authentication requests would not trigger a ban. +This limit: -JWT requests authenticated by gitlab-ci-token are excluded from this limit. +- Is reset by requests that authenticate successfully. For example, 29 + failed authentication requests followed by 1 successful request, followed by 29 + more failed authentication requests would not trigger a ban. +- Does not apply to JWT requests authenticated by `gitlab-ci-token`. No response headers are provided. |