diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-08 16:19:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-08 16:19:40 +0000 |
| commit | ce1efb56eb6a8f32ceaa9f9213bf99069e3a9064 (patch) | |
| tree | e1b3fb6366f1dd27f2f7efed99b59182cebe9f90 | |
| parent | f97cb7f11cf2f9a5e01a24d04f6b1c7034ae5828 (diff) | |
| parent | 3c8c06751cab946e05785be6985c4c23b4cfbb02 (diff) | |
| download | gitlab-ce-ce1efb56eb6a8f32ceaa9f9213bf99069e3a9064.tar.gz | |
Merge branch 'ra_default' of /home/git/repositories/gitlab/gitlabhq
| -rw-r--r-- | config/application.rb | 3 | ||||
| -rw-r--r-- | config/initializers/rack_attack.rb.example | 8 | ||||
| -rw-r--r-- | doc/install/installation.md | 4 |
3 files changed, 3 insertions, 12 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 = [ diff --git a/doc/install/installation.md b/doc/install/installation.md index 6b84674c19e..fe59033513a 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" |