Download as
Browse Code »

Commit ce1efb56eb6a8f32ceaa9f9213bf99069e3a9064

Authored by Dmitriy Zaporozhets
2 parents f97cb7f1 3c8c0675
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'ra_default' of /home/git/repositories/gitlab/gitlabhq

Showing 3 changed files with 3 additions and 12 deletions   Show diff stats
config/application.rb
  Diff comments   View file @ce1efb5
... ... @@ -78,7 +78,6 @@ module Gitlab
78 78 #
79 79 # config.relative_url_root = "/gitlab"
80 80  
81   - # Uncomment to enable rack attack middleware
82   - # config.middleware.use Rack::Attack
  81 + config.middleware.use Rack::Attack
83 82 end
84 83 end
... ...
config/initializers/rack_attack.rb.example
  Diff comments   View file @ce1efb5
1   -# To enable rack-attack for your GitLab instance do the following:
2   -# 1. In config/application.rb find and uncomment the following line:
3   -# config.middleware.use Rack::Attack
4   -# 2. Rename this file to rack_attack.rb
5   -# 3. Review the paths_to_be_protected and add any other path you need protecting
6   -# 4. Restart GitLab instance
  1 +# 1. Rename this file to rack_attack.rb
  2 +# 2. Review the paths_to_be_protected and add any other path you need protecting
7 3 #
8 4  
9 5 paths_to_be_protected = [
... ...
doc/install/installation.md
  Diff comments   View file @ce1efb5
... ... @@ -227,10 +227,6 @@ You can change `6-2-stable` to `master` if you want the *bleeding edge* version,
227 227 # Copy the example Rack attack config
228 228 sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
229 229  
230   - # Enable rack attack middleware
231   - # Find and uncomment the line 'config.middleware.use Rack::Attack'
232   - sudo -u git -H editor config/application.rb
233   -
234 230 # Configure Git global settings for git user, useful when editing via web
235 231 # Edit user.email according to what is set in gitlab.yml
236 232 sudo -u git -H git config --global user.name "GitLab"
... ...