Commit ce1efb56eb6a8f32ceaa9f9213bf99069e3a9064

Authored by Dmitriy Zaporozhets
2 parents f97cb7f1 3c8c0675

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

config/application.rb
@@ -78,7 +78,6 @@ module Gitlab @@ -78,7 +78,6 @@ module Gitlab
78 # 78 #
79 # config.relative_url_root = "/gitlab" 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 end 82 end
84 end 83 end
config/initializers/rack_attack.rb.example
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 paths_to_be_protected = [ 5 paths_to_be_protected = [
doc/install/installation.md
@@ -227,10 +227,6 @@ You can change `6-2-stable` to `master` if you want the *bleeding edge* version, @@ -227,10 +227,6 @@ You can change `6-2-stable` to `master` if you want the *bleeding edge* version,
227 # Copy the example Rack attack config 227 # Copy the example Rack attack config
228 sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb 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 # Configure Git global settings for git user, useful when editing via web 230 # Configure Git global settings for git user, useful when editing via web
235 # Edit user.email according to what is set in gitlab.yml 231 # Edit user.email according to what is set in gitlab.yml
236 sudo -u git -H git config --global user.name "GitLab" 232 sudo -u git -H git config --global user.name "GitLab"