Updated the categories of Application Settings Form
This commit is contained in:
parent
764b5913c8
commit
4cd3c33024
|
@ -859,3 +859,6 @@ DEPENDENCIES
|
|||
virtus
|
||||
webmock (~> 1.21.0)
|
||||
wikicloth (= 0.8.1)
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.3
|
||||
|
|
|
@ -6,44 +6,7 @@
|
|||
%p= msg
|
||||
|
||||
%fieldset
|
||||
%legend Features
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
= f.label :signup_enabled do
|
||||
= f.check_box :signup_enabled
|
||||
Signup enabled
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
= f.label :signin_enabled do
|
||||
= f.check_box :signin_enabled
|
||||
Signin enabled
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
= f.label :gravatar_enabled do
|
||||
= f.check_box :gravatar_enabled
|
||||
Gravatar enabled
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
= f.label :twitter_sharing_enabled do
|
||||
= f.check_box :twitter_sharing_enabled, :'aria-describedby' => 'twitter_help_block'
|
||||
Twitter enabled
|
||||
%span.help-block#twitter_help_block Show users a button to share their newly created public or internal projects on twitter
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
= f.label :version_check_enabled do
|
||||
= f.check_box :version_check_enabled
|
||||
Version check enabled
|
||||
%fieldset
|
||||
%legend Misc
|
||||
.form-group
|
||||
= f.label :default_projects_limit, class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
= f.number_field :default_projects_limit, class: 'form-control'
|
||||
%legend Visibility and Access Controls
|
||||
.form-group
|
||||
= f.label :default_branch_protection, class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
|
@ -64,6 +27,66 @@
|
|||
- restricted_level_checkboxes('restricted-visibility-help').each do |level|
|
||||
= 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
|
||||
= f.check_box :version_check_enabled
|
||||
Version check enabled
|
||||
|
||||
%fieldset
|
||||
%legend Account and Limit Settings
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
= f.label :gravatar_enabled do
|
||||
= f.check_box :gravatar_enabled
|
||||
Gravatar enabled
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
= f.label :twitter_sharing_enabled do
|
||||
= f.check_box :twitter_sharing_enabled, :'aria-describedby' => 'twitter_help_block'
|
||||
Twitter enabled
|
||||
%span.help-block#twitter_help_block Show users a button to share their newly created public or internal projects on twitter
|
||||
.form-group
|
||||
= f.label :default_projects_limit, class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
= f.number_field :default_projects_limit, class: 'form-control'
|
||||
.form-group
|
||||
= f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
= f.number_field :max_attachment_size, class: 'form-control'
|
||||
.form-group
|
||||
= f.label :session_expire_delay, 'Session duration (minutes)', class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
= f.number_field :session_expire_delay, class: 'form-control'
|
||||
%span.help-block#session_expire_delay_help_block GitLab restart is required to apply changes
|
||||
.form-group
|
||||
= f.label :user_oauth_applications, 'User OAuth applications', class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
.checkbox
|
||||
= f.label :user_oauth_applications do
|
||||
= f.check_box :user_oauth_applications
|
||||
Allow users to register any application to use GitLab as an OAuth provider
|
||||
|
||||
%fieldset
|
||||
%legend Sign-in Restrictions
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
= f.label :signin_enabled do
|
||||
= f.check_box :signin_enabled
|
||||
Sign-in enabled
|
||||
.form-group
|
||||
= f.label :home_page_url, class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
|
@ -79,27 +102,6 @@
|
|||
.col-sm-10
|
||||
= f.text_area :sign_in_text, class: 'form-control', rows: 4
|
||||
.help-block Markdown enabled
|
||||
.form-group
|
||||
= f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
= f.number_field :max_attachment_size, class: 'form-control'
|
||||
.form-group
|
||||
= f.label :session_expire_delay, 'Session duration (minutes)', class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
= f.number_field :session_expire_delay, class: 'form-control'
|
||||
%span.help-block#session_expire_delay_help_block GitLab restart is required to apply changes
|
||||
.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 :user_oauth_applications, 'User OAuth applications', class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
.checkbox
|
||||
= f.label :user_oauth_applications do
|
||||
= f.check_box :user_oauth_applications
|
||||
Allow users to register any application to use GitLab as an OAuth provider
|
||||
|
||||
.form-actions
|
||||
= f.submit 'Save', class: 'btn btn-primary'
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
- page_title "Settings"
|
||||
%h3.page-title Application settings
|
||||
%h3.page-title Settings
|
||||
%hr
|
||||
= render 'form'
|
||||
|
|
Loading…
Reference in New Issue