summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarby <darbsies@gmail.com>2015-06-23 15:54:33 -0700
committerDarby <darbsies@gmail.com>2015-06-23 15:54:33 -0700
commitf0c4f0a5d4186be63037a09d681de137f274b119 (patch)
tree864b5150a0fd577eee56706e8caffadb959b4d03
parent4cd3c330241150c1fe235cafb655707316db3d8a (diff)
downloadgitlab-ce-f0c4f0a5d4186be63037a09d681de137f274b119.tar.gz
Changed the placement of Restricted Domainsapplication_settings_form
-rw-r--r--app/views/admin/application_settings/_form.html.haml14
1 files changed, 8 insertions, 6 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 6259176894f..6bef33c6d7a 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -28,11 +28,6 @@
= level
%span.help-block#restricted-visibility-help Selected levels cannot be used by non-admin users for projects or snippets
.form-group
- = 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 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
.col-sm-offset-2.col-sm-10
.checkbox
= f.label :version_check_enabled do
@@ -80,7 +75,9 @@
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
-
+ = f.label :signup_enabled do
+ = f.check_box :signup_enabled
+ Sign-up enabled
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
@@ -88,6 +85,11 @@
= f.check_box :signin_enabled
Sign-in enabled
.form-group
+ = 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 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 :home_page_url, class: 'control-label col-sm-2'
.col-sm-10
= f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block'