Commit 4a9afc76 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'winh-group_admin_settings.html.haml-ee' into 'master'

Copy _group_admin_settings.html.haml from CE

Closes #10505

See merge request gitlab-org/gitlab-ee!12224
parents 3ebbde5a c6f9b688
...@@ -25,5 +25,6 @@ ...@@ -25,5 +25,6 @@
= link_to icon('question-circle'), help_page_path('security/two_factor_authentication', anchor: 'enforcing-2fa-for-all-users-in-a-group') = link_to icon('question-circle'), help_page_path('security/two_factor_authentication', anchor: 'enforcing-2fa-for-all-users-in-a-group')
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .offset-sm-2.col-sm-10
= f.text_field :two_factor_grace_period, class: 'form-control' .form-check
.form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication = f.text_field :two_factor_grace_period, class: 'form-control'
.form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication
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