summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2013-11-06 13:10:59 +0100
committerMarin Jankovski <marin@gitlab.com>2013-11-06 13:10:59 +0100
commit3c8c06751cab946e05785be6985c4c23b4cfbb02 (patch)
treec7372cabbb3c970873aad885bf4032c26c04b100 /config
parentd618a5fec361b85fafffd5cf4a53d044e82bdb5a (diff)
downloadgitlab-ce-3c8c06751cab946e05785be6985c4c23b4cfbb02.tar.gz
Enable rack_attack by default.
Diffstat (limited to 'config')
-rw-r--r--config/application.rb3
-rw-r--r--config/initializers/rack_attack.rb.example8
2 files changed, 3 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb
index d85bcab7885..82e74e7250d 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 76fa7ad282e..c6d3605dc5a 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 = [