Merge branch 'jivl-fix-admin-area-settings-unstyled-form-controls' into 'master'

Fix unstyled form controls for admin settings

Closes #6214

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

app/views/admin/application_settings/_account_and_limit.html.haml

@@ -17,7 +17,7 @@
       .col-sm-10
         = f.number_field :max_attachment_size, class: 'form-control'
 
-      = render 'repository_size_limit_setting', form: f
+    = render 'repository_size_limit_setting', form: f
 
     .form-group.row
       = f.label :session_expire_delay, 'Session duration (minutes)', class: 'col-form-label col-sm-2'
@@ -44,8 +44,8 @@
         = f.label :check_namespace_plan, 'Check feature availability on namespace plan', class: 'col-form-label col-sm-2'
         .col-sm-10
           .form-check
-            = f.label :check_namespace_plan do
-              = f.check_box :check_namespace_plan
+            = f.check_box :check_namespace_plan, class: 'form-check-input'
+            = f.label :check_namespace_plan, class: 'form-check-label' do
               Enabling this will only make licensed EE features available to projects if the project namespace's plan
               includes the feature or if the project is public.
 

app/views/admin/application_settings/_signup.html.haml

@@ -29,7 +29,7 @@
     .form-group.row
       .offset-sm-2.col-sm-10
         .form-check
-          = radio_button_tag :blacklist_type, :file, class: 'form-check-input'
+          = radio_button_tag :blacklist_type, :file, false, class: "form-check-input"
           = label_tag :blacklist_type_file, class: 'form-check-label' do
             .option-title
               Upload blacklist file

ee/app/views/admin/application_settings/_repository_size_limit_setting.html.haml

@@ -2,7 +2,7 @@
 
 - form = local_assigns.fetch(:form)
 
-.form-group
+.form-group.row
   = form.label :repository_size_limit, class: 'col-form-label col-sm-2' do
     Size limit per repository (MB)
   .col-sm-10

ee/app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml

-.form-group
+.form-group.row
   = form.label :shared_runners_minutes, 'Pipeline minutes quota', class: 'col-form-label col-sm-2'
   .col-sm-10
     = form.number_field :shared_runners_minutes, class: 'form-control'

ee/app/views/admin/application_settings/ee/_project_creation_level.html.haml

 - return unless License.feature_available?(:project_creation_level)
 - form = local_assigns.fetch(:form)
 - application_setting = local_assigns.fetch(:application_setting)
-.form-group
+.form-group.row
   = form.label s_('ProjectCreationLevel|Default project creation protection'), class: 'col-form-label col-sm-2'
   .col-sm-10
     = form.select :default_project_creation, options_for_select(Gitlab::Access.project_creation_options, application_setting.default_project_creation), {}, class: 'form-control'

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

@@ -4,7 +4,7 @@
 - type = local_assigns.fetch(:type)
 - label_class = (type == :project) ? 'label-light' : 'col-form-label'
 
-.form-group
+.form-group.row
   = form.label :repository_size_limit, class: label_class do
     Repository size limit (MB)
   - if type == :project