summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2016-01-20 13:16:34 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2016-01-20 15:28:19 +0100
commit8536e083f7b2d7ed77ecae83774d75f68d66e0b4 (patch)
tree116af03385a36c4a3b9e985d4f6cd7a690b6443a /app/controllers/admin
parent481644ca7c9f763d4646ad557cc3bcf8f4f71816 (diff)
downloadgitlab-ce-8536e083f7b2d7ed77ecae83774d75f68d66e0b4.tar.gz
Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-only
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/application_settings_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 91f7d78bd73..6df8e8e4cd8 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -74,6 +74,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:metrics_timeout,
:metrics_method_call_threshold,
:metrics_sample_interval,
+ :ip_blocking_enabled,
+ :dnsbl_servers_list,
:recaptcha_enabled,
:recaptcha_site_key,
:recaptcha_private_key,