[skip ci] .form-horizontal => .form-group.row

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
@@ -11,7 +11,7 @@
       = link_to 'restart', help_page_path('administration/restart_gitlab')
       to take effect.
       = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/index')
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :prometheus_metrics_enabled do

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
-    .form-group
+    .form-group.row
       = f.label :polling_interval_multiplier, 'Polling interval multiplier', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :polling_interval_multiplier, class: 'form-control'

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
-    .form-group
+    .form-group.row
       = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :container_registry_token_expire_delay, class: 'form-control'

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
     .sub-section
       %h4 Repository checks
-      .form-group
+      .form-group.row
         .col-sm-offset-2.col-sm-10
           .form-check
             = f.label :repository_checks_enabled do
@@ -14,7 +14,7 @@
               GitLab will periodically run
               %a{ href: 'https://www.kernel.org/pub/software/scm/git/docs/git-fsck.html', target: 'blank' } 'git fsck'
               in all project and wiki repositories to look for silent disk corruption issues.
-      .form-group
+      .form-group.row
         .col-sm-offset-2.col-sm-10
           = link_to 'Clear all repository checks', clear_repository_check_states_admin_application_settings_path, data: { confirm: 'This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?' }, method: :put, class: "btn btn-sm btn-remove"
           .form-text.text-muted
@@ -22,7 +22,7 @@
     .sub-section
       %h4 Housekeeping
-      .form-group
+      .form-group.row
         .col-sm-offset-2.col-sm-10
           .form-check
             = f.label :housekeeping_enabled do
@@ -40,19 +40,19 @@
             .form-text.text-muted
               Creating pack file bitmaps makes housekeeping take a little longer but
               bitmaps should accelerate 'git clone' performance.
-      .form-group
+      .form-group.row
         = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.number_field :housekeeping_incremental_repack_period, class: 'form-control'
           .form-text.text-muted
             Number of Git pushes after which an incremental 'git repack' is run.
-      .form-group
+      .form-group.row
         = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.number_field :housekeeping_full_repack_period, class: 'form-control'
           .form-text.text-muted
             Number of Git pushes after which a full 'git repack' is run.
-      .form-group
+      .form-group.row
         = f.label :housekeeping_gc_period, 'Git GC period', class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.number_field :housekeeping_gc_period, class: 'form-control'

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
     .sub-section
-      .form-group
+      .form-group.row
         .col-sm-offset-2.col-sm-10
           .form-check
             = f.label :hashed_storage_enabled do
@@ -13,7 +13,7 @@
               Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents
               repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance.
               %em (EXPERIMENTAL)
-      .form-group
+      .form-group.row
         = f.label :repository_storages, 'Storage paths for new projects', class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages),
@@ -24,31 +24,31 @@
               = link_to "repository storages documentation", help_page_path("administration/repository_storages")
     .sub-section
       %h4 Circuit breaker
-      .form-group
+      .form-group.row
         = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.number_field :circuitbreaker_check_interval, class: 'form-control'
           .form-text.text-muted
             = circuitbreaker_check_interval_help_text
-      .form-group
+      .form-group.row
         = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.number_field :circuitbreaker_access_retries, class: 'form-control'
           .form-text.text-muted
             = circuitbreaker_access_retries_help_text
-      .form-group
+      .form-group.row
         = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.number_field :circuitbreaker_storage_timeout, class: 'form-control'
           .form-text.text-muted
             = circuitbreaker_storage_timeout_help_text
-      .form-group
+      .form-group.row
         = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control'
           .form-text.text-muted
             = circuitbreaker_failure_count_help_text
-      .form-group
+      .form-group.row
         = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control'

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :password_authentication_enabled_for_web do
@@ -10,7 +10,7 @@
             Password authentication enabled for web interface
             .form-text.text-muted
               When disabled, an external authentication provider must be used.
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :password_authentication_enabled_for_git do
@@ -22,35 +22,35 @@
                 or LDAP password
               must be used to authenticate.
     - if omniauth_enabled? && button_based_providers.any?
-      .form-group
+      .form-group.row
         = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'col-form-label col-sm-2'
         .col-sm-10
           .btn-group{ data: { toggle: 'buttons' } }
             - oauth_providers_checkboxes.each do |source|
               = source
-    .form-group
+    .form-group.row
       = f.label :two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2'
       .col-sm-10
         .form-check
           = f.label :require_two_factor_authentication do
             = f.check_box :require_two_factor_authentication
             Require all users to setup Two-factor authentication
-    .form-group
+    .form-group.row
       = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0'
         .form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication
-    .form-group
+    .form-group.row
       = f.label :home_page_url, 'Home page URL', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block'
         %span.form-text.text-muted#home_help_block We will redirect non-logged in users to this page
-    .form-group
+    .form-group.row
       = f.label :after_sign_out_path, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :after_sign_out_path, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block'
         %span.form-text.text-muted#after_sign_out_path_help_block We will redirect users to this page after they sign out
-    .form-group
+    .form-group.row
       = f.label :sign_in_text, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_area :sign_in_text, class: 'form-control', rows: 4

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :signup_enabled do
             = f.check_box :signup_enabled
             Sign-up enabled
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :send_user_confirmation_email do
             = f.check_box :send_user_confirmation_email
             Send confirmation email on sign-up
-    .form-group
+    .form-group.row
       = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_area :domain_whitelist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8
         .form-text.text-muted ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
-    .form-group
+    .form-group.row
       = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'col-form-label col-sm-2'
       .col-sm-10
         .form-check
           = f.label :domain_blacklist_enabled do
             = f.check_box :domain_blacklist_enabled
             Enable domain blacklist for sign ups
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = label_tag :blacklist_type_file do
@@ -38,18 +38,18 @@
             = radio_button_tag :blacklist_type, :raw, @application_setting.domain_blacklist.present? || @application_setting.domain_blacklist.blank?
             .option-title
               Enter blacklist manually
-    .form-group.blacklist-file
+    .form-group.row.blacklist-file
       = f.label :domain_blacklist_file, 'Blacklist file', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.file_field :domain_blacklist_file, class: 'form-control', accept: '.txt,.conf'
         .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries.
-    .form-group.blacklist-raw
+    .form-group.row.blacklist-raw
       = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_area :domain_blacklist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8
         .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
-    .form-group
+    .form-group.row
       = f.label :after_sign_up_text, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_area :after_sign_up_text, class: 'form-control', rows: 4

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :recaptcha_enabled do
@@ -10,7 +10,7 @@
             Enable reCAPTCHA
           %span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts
-    .form-group
+    .form-group.row
       = f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :recaptcha_site_key, class: 'form-control'
@@ -18,12 +18,12 @@
           Generate site and private keys at
           %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha
-    .form-group
+    .form-group.row
       = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :recaptcha_private_key, class: 'form-control'
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :akismet_enabled do
@@ -31,7 +31,7 @@
             Enable Akismet
           %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues
-    .form-group
+    .form-group.row
       = f.label :akismet_api_key, 'Akismet API Key', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :akismet_api_key, class: 'form-control'
@@ -39,7 +39,7 @@
           Generate API key at
           %a{ href: 'http://www.akismet.com', target: 'blank' } http://www.akismet.com
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :unique_ips_limit_enabled do
@@ -48,14 +48,14 @@
           %span.form-text.text-muted#unique_ip_help_block
             Helps prevent malicious users hide their activity
-    .form-group
+    .form-group.row
       = f.label :unique_ips_limit_per_user, 'IPs per user', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :unique_ips_limit_per_user, class: 'form-control'
         .form-text.text-muted
           Maximum number of unique IPs per user
-    .form-group
+    .form-group.row
       = f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :unique_ips_limit_time_window, class: 'form-control'

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
-    .form-group
+    .form-group.row
       = f.label :terminal_max_session_time, 'Max session time', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :terminal_max_session_time, class: 'form-control'

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :version_check_enabled do
@@ -12,7 +12,7 @@
             GitLab will inform you if a new version is available.
             = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check")
             about what information is shared with GitLab Inc.
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         - can_be_configured = @application_setting.usage_ping_can_be_configured?
         .form-check

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
   %fieldset
-    .form-group
+    .form-group.row
       = f.label :default_branch_protection, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control'
-    .form-group.visibility-level-setting
+    .form-group.row.visibility-level-setting
       = f.label :default_project_visibility, class: 'col-form-label col-sm-2'
       .col-sm-10
         = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new)
-    .form-group.visibility-level-setting
+    .form-group.row.visibility-level-setting
       = f.label :default_snippet_visibility, class: 'col-form-label col-sm-2'
       .col-sm-10
         = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new)
-    .form-group.visibility-level-setting
+    .form-group.row.visibility-level-setting
       = f.label :default_group_visibility, class: 'col-form-label col-sm-2'
       .col-sm-10
         = render('shared/visibility_radios', model_method: :default_group_visibility, form: f, selected_level: @application_setting.default_group_visibility, form_model: Group.new)
-    .form-group
+    .form-group.row
       = f.label :restricted_visibility_levels, class: 'col-form-label col-sm-2'
       .col-sm-10
         - checkbox_name = 'application_setting[restricted_visibility_levels][]'
@@ -29,7 +29,7 @@
         %span.form-text.text-muted#restricted-visibility-help
           Selected levels cannot be used by non-admin users for projects or snippets.
           If the public level is restricted, user profiles are only visible to logged in users.
-    .form-group
+    .form-group.row
       = f.label :import_sources, class: 'col-form-label col-sm-2'
       .col-sm-10
         - import_sources_checkboxes('import-sources-help').each do |source|
@@ -42,14 +42,14 @@
           and GitLab.com
           = link_to "(?)", help_page_path("integration/gitlab")
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :project_export_enabled do
             = f.check_box :project_export_enabled
             Project export enabled
-    .form-group
+    .form-group.row
       %label.col-form-label.col-sm-2 Enabled Git access protocols
       .col-sm-10
         = select(:application_setting, :enabled_git_access_protocol, [['Both SSH and HTTP(S)', nil], ['Only SSH', 'ssh'], ['Only HTTP(S)', 'http']], {}, class: 'form-control')
@@ -58,7 +58,7 @@
     - ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type|
       - field_name = :"#{type}_key_restriction"
-      .form-group
+      .form-group.row
         = f.label field_name, "#{type.upcase} SSH keys", class: 'col-form-label col-sm-2'
         .col-sm-10
           = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control'

app/views/admin/applications/_form.html.haml

-= form_for [:admin, @application], url: @url, html: {class: 'form-horizontal', role: 'form'} do |f|
+= form_for [:admin, @application], url: @url, html: {role: 'form'} do |f|
   = form_errors(application)
   = content_tag :div, class: 'form-group' do
@@ -27,7 +27,7 @@
       %span.form-text.text-muted
         Trusted applications are automatically authorized on GitLab OAuth flow.
-  .form-group
+  .form-group.row
     = f.label :scopes, class: 'col-sm-2 col-form-label'
     .col-sm-10
       = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes

app/views/admin/broadcast_messages/_form.html.haml

@@ -6,31 +6,31 @@
     - else
       Your message here
-= form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form form-horizontal js-quick-submit js-requires-input'} do |f|
+= form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form js-quick-submit js-requires-input'} do |f|
   = form_errors(@broadcast_message)
-  .form-group
+  .form-group.row
     = f.label :message, class: 'col-form-label'
     .col-sm-10
       = f.text_area :message, class: "form-control js-autosize",
         required: true,
         data: { preview_path: preview_admin_broadcast_messages_path }
-  .form-group.js-toggle-colors-container
+  .form-group.row.js-toggle-colors-container
     .col-sm-10.col-sm-offset-2
       = link_to 'Customize colors', '#', class: 'js-toggle-colors-link'
-  .form-group.js-toggle-colors-container.d-none
+  .form-group.row.js-toggle-colors-container.d-none
     = f.label :color, "Background Color", class: 'col-form-label'
     .col-sm-10
       = f.color_field :color, class: "form-control"
-  .form-group.js-toggle-colors-container.d-none
+  .form-group.row.js-toggle-colors-container.d-none
     = f.label :font, "Font Color", class: 'col-form-label'
     .col-sm-10
       = f.color_field :font, class: "form-control"
-  .form-group
+  .form-group.row
     = f.label :starts_at, class: 'col-form-label'
     .col-sm-10.datetime-controls
       = f.datetime_select :starts_at, {}, class: 'form-control form-control-inline'
-  .form-group
+  .form-group.row
     = f.label :ends_at, class: 'col-form-label'
     .col-sm-10.datetime-controls
       = f.datetime_select :ends_at, {}, class: 'form-control form-control-inline'

app/views/admin/deploy_keys/edit.html.haml

@@ -3,7 +3,7 @@
 %hr
 %div
-  = form_for [:admin, @deploy_key], html: { class: 'deploy-key-form form-horizontal' } do |f|
+  = form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
     = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
     .form-actions
       = f.submit 'Save changes', class: 'btn-save btn'

app/views/admin/deploy_keys/new.html.haml

@@ -3,7 +3,7 @@
 %hr
 %div
-  = form_for [:admin, @deploy_key], html: { class: 'deploy-key-form form-horizontal' } do |f|
+  = form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
     = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
     .form-actions
       = f.submit 'Create', class: 'btn-create btn'

app/views/admin/groups/_form.html.haml

-= form_for [:admin, @group], html: { class: "form-horizontal" } do |f|
+= form_for [:admin, @group] do |f|
   = form_errors(@group)
   = render 'shared/group_form', f: f
-  .form-group.group-description-holder
+  .form-group.row.group-description-holder
     = f.label :avatar, "Group avatar", class: 'col-form-label'
     .col-sm-10
       = render 'shared/choose_group_avatar_button', f: f
   = render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group
-  .form-group
+  .form-group.row
     .col-sm-offset-2.col-sm-10
       = render 'shared/allow_request_access', form: f
   = render 'groups/group_admin_settings', f: f
   - if @group.new_record?
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .alert.alert-info
           = render 'shared/group_tips'

app/views/admin/hooks/edit.html.haml

@@ -9,7 +9,7 @@
 %hr
-= form_for @hook, as: :hook, url: admin_hook_path, html: { class: 'form-horizontal' } do |f|
+= form_for @hook, as: :hook, url: admin_hook_path do |f|
   = render partial: 'form', locals: { form: f, hook: @hook }
   .form-actions
     = f.submit 'Save changes', class: 'btn btn-create'

app/views/admin/identities/_form.html.haml

-= form_for [:admin, @user, @identity], html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for [:admin, @user, @identity], html: { class: 'fieldset-form' } do |f|
   = form_errors(@identity)
-  .form-group
+  .form-group.row
     = f.label :provider, class: 'col-form-label'
     .col-sm-10
       - values = Gitlab::Auth::OAuth::Provider.providers.map { |name| ["#{Gitlab::Auth::OAuth::Provider.label_for(name)} (#{name})", name] }
       = f.select :provider, values, { allow_blank: false }, class: 'form-control'
-  .form-group
+  .form-group.row
     = f.label :extern_uid, "Identifier", class: 'col-form-label'
     .col-sm-10
       = f.text_field :extern_uid, class: 'form-control', required: true

app/views/admin/labels/_form.html.haml

-= form_for [:admin, @label], html: { class: 'form-horizontal label-form js-requires-input' } do |f|
+= form_for [:admin, @label], html: { class: 'label-form js-requires-input' } do |f|
   = form_errors(@label)
-  .form-group
+  .form-group.row
     = f.label :title, class: 'col-form-label'
     .col-sm-10
       = f.text_field :title, class: "form-control", required: true
-  .form-group
+  .form-group.row
     = f.label :description, class: 'col-form-label'
     .col-sm-10
       = f.text_field :description, class: "form-control js-quick-submit"
-  .form-group
+  .form-group.row
     = f.label :color, "Background color", class: 'col-form-label'
     .col-sm-10
       .input-group

app/views/admin/projects/show.html.haml

@@ -114,8 +114,8 @@
       .card-header
         Transfer project
       .card-body
-        = form_for @project, url: transfer_admin_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f|
-          .form-group
+        = form_for @project, url: transfer_admin_project_path(@project), method: :put do |f|
+          .form-group.row
             = f.label :new_namespace_id, "Namespace", class: 'col-form-label'
             .col-sm-10
               .dropdown
@@ -126,7 +126,7 @@
                   = dropdown_content
                   = dropdown_loading
-          .form-group
+          .form-group.row
             .col-sm-offset-2.col-sm-10
               = f.submit 'Transfer', class: 'btn btn-primary'