Merge branch 'improve-restricted-domains-help' into 'master'

Improve help line for restricted domain signups The setting may be misconstrued as only allowing access from certain domains. Add help to clarify this applies to e-mail domains. See merge request !612

Merge branch 'improve-restricted-domains-help' into 'master'
f78cd577 · Robert Schilling · 5bff135f · a1c6f7ce · f78cd577
Commit f78cd577 authored May 06, 2015 by Robert Schilling
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_form.html.haml app/views/admin/application_settings/_form.html.haml +1 -1

No files found.
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -76,7 +76,7 @@
      = f.label :restricted_signup_domains, 'Restricted 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'
-        .help-block Ex: domain.com, *.domain.com. Wildcards allowed. Use separate lines for multiple entries.
+        .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-actions
    = f.submit 'Save', class: 'btn btn-primary'