summaryrefslogtreecommitdiff
path: root/doc/security
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-07-25 09:41:48 +0000
committerDouwe Maan <douwe@gitlab.com>2018-07-25 09:41:48 +0000
commit9aa07a7ec2d55ee2a7427eb77469e8e4b03eca06 (patch)
treeb633142b34d37b5241e4bac110341eeea98f530e /doc/security
parentcd03a8ad6f52d615b19b3f1f9cadd01c8e2b58a9 (diff)
parentf0f285efc2d6abef8817ec811eaddeef5838c195 (diff)
downloadgitlab-ce-9aa07a7ec2d55ee2a7427eb77469e8e4b03eca06.tar.gz
Merge branch 'update-rack-attack-deprecation-note-in-docs' into 'master'
Adds rack attack disabled by default notice to documentation See merge request gitlab-org/gitlab-ce!20833
Diffstat (limited to 'doc/security')
-rw-r--r--doc/security/rack_attack.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/security/rack_attack.md b/doc/security/rack_attack.md
index 4d1e157031c..3efb19c1526 100644
--- a/doc/security/rack_attack.md
+++ b/doc/security/rack_attack.md
@@ -9,6 +9,10 @@ In case you find throttling is not enough to protect you against abusive clients
Rack Attack offers IP whitelisting, blacklisting, Fail2ban style filtering and
tracking.
+**Note:** Starting with 11.2, Rack Attack is disabled by default. To continue
+using this feature, please enable it in your `gitlab.rb` by setting
+`gitlab_rails['rack_attack_git_basic_auth'] = true`.
+
By default, user sign-in, user sign-up (if enabled), and user password reset is
limited to 6 requests per minute. After trying for 6 times, the client will
have to wait for the next minute to be able to try again.