diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-05-06 06:17:30 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-05-06 06:17:30 +0000 |
| commit | f78cd577e5777605f0100d9a0e678b40cb133cde (patch) | |
| tree | 9be3f1f63127a00d7dd70aba8ab6b5adeb1510ac /app | |
| parent | 5bff135fb3dbd1af855f8cd94b4bed76d2cbc42e (diff) | |
| parent | a1c6f7ce208e816febf3688b668a36929b2e4015 (diff) | |
| download | gitlab-ce-f78cd577e5777605f0100d9a0e678b40cb133cde.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index f6eb00ea0bd..b9d7e8b4586 100644 --- 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' |