diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 15:07:00 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 15:07:00 -0500 |
| commit | 985297d82ac706bee0a310bf61003ac1f5c56b8a (patch) | |
| tree | 309512a384624ac927e8cc11b1adc340134cf79b /app/views | |
| parent | 86b75f4713fa6cb14cbf443c1e29ca6384204b65 (diff) | |
| parent | 1553c560e0d02e670b7cec2b443545e67418b569 (diff) | |
| download | gitlab-ce-issue_3945.tar.gz | |
Merge branch 'master' into issue_3945issue_3945
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 16 |
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 |