diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-07-15 18:30:38 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-18 17:53:43 -0500 |
| commit | c71e658ccac85f111517e04b79d915c10867c7e3 (patch) | |
| tree | ffbea4cb96791b4f78ae0d9e4bb3b51f54cc8ecc /app/views | |
| parent | a3f0f2cc4d9a4c689ae0eeae73e6d4ef19c39cce (diff) | |
| download | gitlab-ce-c71e658ccac85f111517e04b79d915c10867c7e3.tar.gz | |
Refactor and rename `restricted_signup_domains` to `domain_whitelist` to better conform to its behavior and newly introduced behavior.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 9443fe5e1d3..35fea2d8fa9 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -123,9 +123,9 @@ = f.check_box :send_user_confirmation_email Send confirmation email on sign-up .form-group - = f.label :restricted_signup_domains, 'Restricted domains for sign-ups', class: 'control-label col-sm-2' + = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'control-label col-sm-2' .col-sm-10 - = f.text_area :restricted_signup_domains_raw, placeholder: 'domain.com', class: 'form-control' + = f.text_area :domain_whitelist_raw, placeholder: 'domain.com', class: 'form-control' .help-block ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com .form-group = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'control-label col-sm-2' @@ -152,7 +152,7 @@ = f.file_field :domain_blacklist_file, class: 'form-control', accept: '.txt,.conf' .help-block Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries. .form-group.blacklist-raw - = f.label :domain_blacklist, 'Blacklisted domains', class: 'control-label col-sm-2' + = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'control-label col-sm-2' .col-sm-10 = f.text_area :domain_blacklist_raw, placeholder: 'domain.com', class: 'form-control', rows: 10 .help-block Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com @@ -385,22 +385,4 @@ .form-actions - = f.submit 'Save', class: 'btn btn-save' - -:javascript - function showBlacklistType() { - if ($("input[name='blacklist_type']:checked").val() == "file") - { - $(".blacklist-file").show(); - $(".blacklist-raw").hide(); - } - else - { - $(".blacklist-file").hide(); - $(".blacklist-raw").show(); - } - } - - $("input[name='blacklist_type']").click(showBlacklistType); - - showBlacklistType();
\ No newline at end of file + = f.submit 'Save', class: 'btn btn-save'
\ No newline at end of file |