diff --git a/config/application.rb b/config/application.rb index d85bcab7885b62bc6f656ea5486b2c672be5269d..82e74e7250d16f4b495f607482e6c42f20e87291 100644 --- a/config/application.rb +++ b/config/application.rb @@ -78,7 +78,6 @@ module Gitlab # # config.relative_url_root = "/gitlab" - # Uncomment to enable rack attack middleware - # config.middleware.use Rack::Attack + config.middleware.use Rack::Attack end end diff --git a/config/initializers/rack_attack.rb.example b/config/initializers/rack_attack.rb.example index 76fa7ad282e9350fa1b14b0f882493e42deee3b3..c6d3605dc5a7dee4077d0e1b8b6d24ffa2af2a9a 100644 --- a/config/initializers/rack_attack.rb.example +++ b/config/initializers/rack_attack.rb.example @@ -1,9 +1,5 @@ -# To enable rack-attack for your GitLab instance do the following: -# 1. In config/application.rb find and uncomment the following line: -# config.middleware.use Rack::Attack -# 2. Rename this file to rack_attack.rb -# 3. Review the paths_to_be_protected and add any other path you need protecting -# 4. Restart GitLab instance +# 1. Rename this file to rack_attack.rb +# 2. Review the paths_to_be_protected and add any other path you need protecting # paths_to_be_protected = [ diff --git a/doc/install/installation.md b/doc/install/installation.md index 134ec3c1eccd55097a168e1a8706786929eb68f6..bc663c3ec4ad162c1452f42180c4860068407c51 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -227,10 +227,6 @@ You can change `6-2-stable` to `master` if you want the *bleeding edge* version, # Copy the example Rack attack config sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb - # Enable rack attack middleware - # Find and uncomment the line 'config.middleware.use Rack::Attack' - sudo -u git -H editor config/application.rb - # Configure Git global settings for git user, useful when editing via web # Edit user.email according to what is set in gitlab.yml sudo -u git -H git config --global user.name "GitLab"