Commit 29062a70 authored by David O'Regan's avatar David O'Regan

Merge branch '334296-follow-up' into 'master'

Consolidate the UX of "Time before enforced" setting

See merge request gitlab-org/gitlab!72280
parents 0010c6b0 84208b27
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
_('Require all users in this group to set up two-factor authentication'), _('Require all users in this group to set up two-factor authentication'),
checkbox_options: { data: { qa_selector: 'require_2fa_checkbox' } } checkbox_options: { data: { qa_selector: 'require_2fa_checkbox' } }
.form-group .form-group
= f.label :two_factor_grace_period, _('Time before enforced'), class: 'label-bold' = f.label :two_factor_grace_period, _('Time before enforced')
= f.text_field :two_factor_grace_period, class: 'form-control form-control-sm w-auto' = f.text_field :two_factor_grace_period, class: 'form-control form-control-sm w-auto gl-form-input gl-mb-3'
.form-text.text-muted= _('Time (in hours) that users are allowed to skip forced configuration of two-factor authentication.') .form-text.text-muted= _('Time (in hours) that users are allowed to skip forced configuration of two-factor authentication.')
- unless group.has_parent? - unless group.has_parent?
.form-group .form-group
......
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