diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-05 03:07:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-05 03:07:50 +0300 |
commit | 54cbcea92909e69248abc9e6b92c7d14db3308a5 (patch) | |
tree | 1276f1c57b5ab1064db7197c2d28a8837d68d02d /config/initializers/1_settings.rb | |
parent | 71221554dd9ddf30f73035c89f78164e001aa96d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index f3635613339..9c5a07919b3 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -645,6 +645,7 @@ Settings.rack_attack.git_basic_auth['ip_whitelist'] ||= %w{127.0.0.1} Settings.rack_attack.git_basic_auth['maxretry'] ||= 10 Settings.rack_attack.git_basic_auth['findtime'] ||= 1.minute Settings.rack_attack.git_basic_auth['bantime'] ||= 1.hour +Settings.rack_attack['admin_area_protected_paths_enabled'] ||= false # # Gitaly |