Commit ef8d8c27 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '358324-use-pajamas-checkbox' into 'master'

Use pajamas checkbox for user access level form

See merge request gitlab-org/gitlab!84849
parents 5ecec3bc 3a60faf8
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.col-sm-2.col-form-label.gl-pt-0 .col-sm-2.col-form-label.gl-pt-0
= f.label :can_create_group = f.label :can_create_group
.col-sm-10 .col-sm-10
= f.check_box :can_create_group = f.gitlab_ui_checkbox_component :can_create_group, ''
.form-group.row .form-group.row
.col-sm-2.col-form-label.gl-pt-0 .col-sm-2.col-form-label.gl-pt-0
...@@ -39,10 +39,7 @@ ...@@ -39,10 +39,7 @@
= f.label :external = f.label :external
.hidden{ data: user_internal_regex_data } .hidden{ data: user_internal_regex_data }
.col-sm-10.gl-display-flex.gl-align-items-baseline .col-sm-10.gl-display-flex.gl-align-items-baseline
= f.check_box :external do = f.gitlab_ui_checkbox_component :external, s_('AdminUsers|External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects, groups, or personal snippets.')
= s_('AdminUsers|External')
%p.light.gl-pl-2
= s_('AdminUsers|External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects, groups, or personal snippets.')
%row.hidden#warning_external_automatically_set %row.hidden#warning_external_automatically_set
= gl_badge_tag s_('AdminUsers|Automatically marked as default internal user'), variant: :warning = gl_badge_tag s_('AdminUsers|Automatically marked as default internal user'), variant: :warning
...@@ -50,12 +47,9 @@ ...@@ -50,12 +47,9 @@
- @user.credit_card_validation || @user.build_credit_card_validation - @user.credit_card_validation || @user.build_credit_card_validation
= f.fields_for :credit_card_validation do |ff| = f.fields_for :credit_card_validation do |ff|
.col-sm-2.col-form-label.gl-pt-0 .col-sm-2.col-form-label.gl-pt-0
= ff.label s_("AdminUsers|Validate user account") = ff.label s_('AdminUsers|Validate user account')
.col-sm-10.gl-display-flex.gl-align-items-baseline .col-sm-10.gl-display-flex.gl-align-items-baseline
= ff.check_box :credit_card_validated_at, checked: @user.credit_card_validated_at.present? = ff.gitlab_ui_checkbox_component :credit_card_validated_at,
.gl-pl-2 s_('AdminUsers|User is validated and can use free CI minutes on shared runners.'),
.light help_text: s_('AdminUsers|A user can validate themselves by inputting a credit/debit card, or an admin can manually validate a user.'),
= s_('AdminUsers|User is validated and can use free CI minutes on shared runners.') checkbox_options: { checked: @user.credit_card_validated_at.present? }
.gl-text-gray-600
= s_('AdminUsers|A user can validate themselves by inputting a credit/debit card, or an admin can manually validate a user.')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment