Merge branch 'fix-group-settings' into 'master'

Fix misalignment in admin group UI settings

Closes #6482

See merge request gitlab-org/gitlab-ee!6191

app/views/groups/_group_admin_settings.html.haml

@@ -23,6 +23,5 @@
           = link_to icon('question-circle'), help_page_path('security/two_factor_authentication', anchor: 'enforcing-2fa-for-all-users-in-a-group')
 .form-group.row
   .offset-sm-2.col-sm-10
-    .form-check
-      = 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
+    = 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

ee/app/views/groups/_member_lock_setting.html.haml

 - return unless can?(current_user, :admin_group, group) && License.feature_available?(:member_lock)
 
-.form-group
-  %hr
-  = f.label :membership_lock, class: 'col-form-label' do
+%hr
+.form-group.row
+  = f.label :membership_lock, class: 'col-form-label col-sm-2' do
     Member lock
   .col-sm-10
     .form-check

ee/app/views/groups/ee/_project_creation_level.html.haml

 - return unless group.feature_available?(:project_creation_level)
 - form = local_assigns.fetch(:form)
 - group = local_assigns.fetch(:group)
-.form-group
+.form-group.row
   = form.label s_('ProjectCreationLevel|Allowed to create projects'), class: 'col-form-label col-sm-2'
   .col-sm-10
     = form.select :project_creation_level, options_for_select(::Gitlab::Access.project_creation_options, group.project_creation_level), {}, class: 'form-control'

ee/app/views/shared/_repository_size_limit_setting.html.haml

@@ -2,7 +2,7 @@
 
 - form = local_assigns.fetch(:form)
 - type = local_assigns.fetch(:type)
-- label_class = (type == :project) ? 'label-light' : 'col-form-label'
+- label_class = (type == :project) ? 'label-light' : 'col-form-label col-sm-2'
 
 .form-group.row
   = form.label :repository_size_limit, class: label_class do