summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-01-20 14:24:20 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-01-20 14:24:20 -0500
commit1553c560e0d02e670b7cec2b443545e67418b569 (patch)
tree81c4fbabbd376d80db86a09d39f79ea35abee068 /app/views/admin
parenta8a65afe1e953ce3a9fc151f9e033b99fc568fad (diff)
parent8536e083f7b2d7ed77ecae83774d75f68d66e0b4 (diff)
downloadgitlab-ce-1553c560e0d02e670b7cec2b443545e67418b569.tar.gz
Merge branch 'feature/check-against-rbl-only' into 'master'
Split from !2455 References #9092 See merge request !2515
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/application_settings/_form.html.haml16
1 files changed, 16 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 35e4dd761ab..c4020c8273b 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -215,6 +215,22 @@
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
+ = f.label :ip_blocking_enabled do
+ = f.check_box :ip_blocking_enabled
+ Enable IP check against blacklist at sign-up
+ .help-block Helps preventing accounts creation from 'known spam sources'
+
+ .form-group
+ = f.label :dnsbl_servers_list, class: 'control-label col-sm-2' do
+ DNSBL servers list
+ .col-sm-10
+ = f.text_field :dnsbl_servers_list, class: 'form-control'
+ .help-block
+ Please enter DNSBL servers separated with comma
+
+ .form-group
+ .col-sm-offset-2.col-sm-10
+ .checkbox
= f.label :recaptcha_enabled do
= f.check_box :recaptcha_enabled
Enable reCAPTCHA