summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-12-12 11:56:51 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-12-12 11:56:51 +0000
commit7306f7afb4bf97035d79f01e4dfcfdcfc4ad16bc (patch)
tree4517153a94873bbee9fb25890caed95e9a4e35c9
parent7b1ea8cae2d43498f2eff02ead21977a90822ce1 (diff)
parent36426fe5785d24a852b4afd47d9627e00fcae120 (diff)
downloadgitlab-ce-7306f7afb4bf97035d79f01e4dfcfdcfc4ad16bc.tar.gz
Merge branch 'docs-update-rack-attack' into 'master'
Remove incorrect example Rack Attack configuration Closes #54983 See merge request gitlab-org/gitlab-ce!23742
-rw-r--r--doc/security/rack_attack.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/security/rack_attack.md b/doc/security/rack_attack.md
index dcdc9f42c22..ad83dc05a93 100644
--- a/doc/security/rack_attack.md
+++ b/doc/security/rack_attack.md
@@ -10,8 +10,7 @@ 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`.
+using this feature, please enable it by [configuring `gitlab.rb` as described in Settings](#settings).
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