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

91 files changed, 342 insertions, 345 deletions

diff --git a/app/assets/javascripts/ide/components/new_dropdown/modal.vue b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
index 4b5a50785b6..5082053eabe 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
@@ -77,11 +77,10 @@ export default {
     @submit="createEntryInStore"
   >
     <form
-      class="form-horizontal"
       slot="body"
       @submit.prevent="createEntryInStore"
     >
-      <fieldset class="form-group append-bottom-0">
+      <fieldset class="form-group row append-bottom-0">
         <label class="label-light col-sm-3">
           {{ formLabelName }}
         </label>
diff --git a/app/assets/javascripts/ide/components/repo_commit_section.vue b/app/assets/javascripts/ide/components/repo_commit_section.vue
index 01da1a19d20..121babf1b2b 100644
--- a/app/assets/javascripts/ide/components/repo_commit_section.vue
+++ b/app/assets/javascripts/ide/components/repo_commit_section.vue
@@ -101,7 +101,7 @@ export default {
       v-if="changedFiles.length"
     >
       <form
-        class="form-horizontal multi-file-commit-form"
+        class="multi-file-commit-form"
         @submit.prevent.stop="commitChanges"
         v-if="!rightPanelCollapsed"
       >
diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml
index 9734001500f..cfa38fb4262 100644
--- a/app/views/abuse_reports/new.html.haml
+++ b/app/views/abuse_reports/new.html.haml
@@ -2,16 +2,16 @@
 %h3.page-title Report abuse
 %p Please use this form to report users who create spam issues, comments or behave inappropriately.
 %hr
-= form_for @abuse_report, html: { class: 'form-horizontal js-quick-submit js-requires-input'} do |f|
+= form_for @abuse_report, html: { class: 'js-quick-submit js-requires-input'} do |f|
   = form_errors(@abuse_report)
 
   = f.hidden_field :user_id
-  .form-group
+  .form-group.row
     = f.label :user_id, class: 'col-form-label'
     .col-sm-10
       - name = "#{@abuse_report.user.name} (@#{@abuse_report.user.username})"
       = text_field_tag :user_name, name, class: "form-control", readonly: true
-  .form-group
+  .form-group.row
     = f.label :message, class: 'col-form-label'
     .col-sm-10
       = f.text_area :message, class: "form-control", rows: 2, required: true, value: sanitize(@ref_url)
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml
index ec86ce5c114..d3637a3dcdd 100644
--- a/app/views/admin/appearances/_form.html.haml
+++ b/app/views/admin/appearances/_form.html.haml
@@ -1,10 +1,10 @@
-= form_for @appearance, url: admin_appearances_path, html: { class: 'form-horizontal'} do |f|
+= form_for @appearance, url: admin_appearances_path, do |f|
   = form_errors(@appearance)
 
   %fieldset.app_logo
     %legend
       Navigation bar:
-  .form-group
+  .form-group.row
     = f.label :header_logo, 'Header logo', class: 'col-form-label'
     .col-sm-10
       - if @appearance.header_logo?
@@ -21,17 +21,17 @@
   %fieldset.sign-in
     %legend
       Sign in/Sign up pages:
-  .form-group
+  .form-group.row
     = f.label :title, class: 'col-form-label'
     .col-sm-10
       = f.text_field :title, class: "form-control"
-  .form-group
+  .form-group.row
     = f.label :description, class: 'col-form-label'
     .col-sm-10
       = f.text_area :description, class: "form-control", rows: 10
       .hint
         Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('user/markdown'), target: '_blank'}.
-  .form-group
+  .form-group.row
     = f.label :logo, class: 'col-form-label'
     .col-sm-10
       - if @appearance.logo?
@@ -48,7 +48,7 @@
   %fieldset
     %legend
       New project pages:
-  .form-group
+  .form-group.row
     = f.label :new_project_guidelines, class: 'col-form-label'
     .col-sm-10
       = f.text_area :new_project_guidelines, class: "form-control", rows: 10
diff --git a/app/views/admin/application_settings/_abuse.html.haml b/app/views/admin/application_settings/_abuse.html.haml
index 39dcc28a397..6b9b2a17dd9 100644
--- a/app/views/admin/application_settings/_abuse.html.haml
+++ b/app/views/admin/application_settings/_abuse.html.haml
@@ -1,8 +1,8 @@
-= 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 :admin_notification_email, 'Abuse reports notification email', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :admin_notification_email, class: 'form-control'
diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml
index bbfae062624..4cd2941202c 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -1,34 +1,34 @@
-= 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 :gravatar_enabled do
             = f.check_box :gravatar_enabled
             Gravatar enabled
-    .form-group
+    .form-group.row
       = f.label :default_projects_limit, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :default_projects_limit, class: 'form-control'
-    .form-group
+    .form-group.row
       = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :max_attachment_size, class: 'form-control'
-    .form-group
+    .form-group.row
       = f.label :session_expire_delay, 'Session duration (minutes)', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :session_expire_delay, class: 'form-control'
         %span.form-text.text-muted#session_expire_delay_help_block GitLab restart is required to apply changes
-    .form-group
+    .form-group.row
       = f.label :user_oauth_applications, 'User OAuth applications', class: 'col-form-label col-sm-2'
       .col-sm-10
         .form-check
           = f.label :user_oauth_applications do
             = f.check_box :user_oauth_applications
             Allow users to register any application to use GitLab as an OAuth provider
-    .form-group
+    .form-group.row
       = f.label :user_default_external, 'New users set to external', class: 'col-form-label col-sm-2'
       .col-sm-10
         .form-check
diff --git a/app/views/admin/application_settings/_background_jobs.html.haml b/app/views/admin/application_settings/_background_jobs.html.haml
index 835b8c80763..5c10b9e3922 100644
--- a/app/views/admin/application_settings/_background_jobs.html.haml
+++ b/app/views/admin/application_settings/_background_jobs.html.haml
@@ -1,4 +1,4 @@
-= 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
@@ -6,7 +6,7 @@
       These settings require a
       = link_to 'restart', help_page_path('administration/restart_gitlab')
       to take effect.
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :sidekiq_throttling_enabled do
@@ -14,13 +14,13 @@
             Enable Sidekiq Job Throttling
           .form-text.text-muted
             Limit the amount of resources slow running jobs are assigned.
-    .form-group
+    .form-group.row
       = f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.select :sidekiq_throttling_queues, sidekiq_queue_options_for_select, { include_hidden: false }, multiple: true, class: 'select2 select-wide', data: { field: 'sidekiq_throttling_queues' }
         .form-text.text-muted
           Choose which queues you wish to throttle.
-    .form-group
+    .form-group.row
       = f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :sidekiq_throttling_factor, class: 'form-control', min: '0.01', max: '0.99', step: '0.01'
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml
index 37ed551757c..f9788c15e5f 100644
--- a/app/views/admin/application_settings/_ci_cd.html.haml
+++ b/app/views/admin/application_settings/_ci_cd.html.haml
@@ -1,8 +1,8 @@
-= 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 :auto_devops_enabled do
@@ -11,31 +11,31 @@
         .form-text.text-muted
           It will automatically build, test, and deploy applications based on a predefined CI/CD configuration
           = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md')
-    .form-group
+    .form-group.row
       = f.label :auto_devops_domain, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :auto_devops_domain, class: 'form-control', placeholder: 'domain.com'
         .form-text.text-muted
           = s_("AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages.")
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :shared_runners_enabled do
             = f.check_box :shared_runners_enabled
             Enable shared runners for new projects
-    .form-group
+    .form-group.row
       = f.label :shared_runners_text, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_area :shared_runners_text, class: 'form-control', rows: 4
         .form-text.text-muted Markdown enabled
-    .form-group
+    .form-group.row
       = f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :max_artifacts_size, class: 'form-control'
         .form-text.text-muted
           Set the maximum file size for each job's artifacts
           = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size')
-    .form-group
+    .form-group.row
       = f.label :default_artifacts_expire_in, 'Default artifacts expiration', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :default_artifacts_expire_in, class: 'form-control'
diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml
index 59f654b62f7..fbcf9126a28 100644
--- a/app/views/admin/application_settings/_email.html.haml
+++ b/app/views/admin/application_settings/_email.html.haml
@@ -1,8 +1,8 @@
-= 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 :email_author_in_body do
@@ -12,7 +12,7 @@
             Some email servers do not support overriding the email sender name.
             Enable this option to include the name of the author of the issue,
             merge request or comment in the email body instead.
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :html_emails_enabled do
diff --git a/app/views/admin/application_settings/_gitaly.html.haml b/app/views/admin/application_settings/_gitaly.html.haml
index 3a168cc879d..859a1c6f45c 100644
--- a/app/views/admin/application_settings/_gitaly.html.haml
+++ b/app/views/admin/application_settings/_gitaly.html.haml
@@ -1,15 +1,15 @@
-= 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 :gitaly_timeout_default, 'Default Timeout Period', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :gitaly_timeout_default, class: 'form-control'
         .form-text.text-muted
           Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced
           for git fetch/push operations or Sidekiq jobs.
-    .form-group
+    .form-group.row
       = f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :gitaly_timeout_fast, class: 'form-control'
@@ -17,7 +17,7 @@
           Fast operation timeout (in seconds). Some Gitaly operations are expected to be fast.
           If they exceed this threshold, there may be a problem with a storage shard and 'failing fast'
           can help maintain the stability of the GitLab instance.
-    .form-group
+    .form-group.row
       = f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :gitaly_timeout_medium, class: 'form-control'
diff --git a/app/views/admin/application_settings/_help_page.html.haml b/app/views/admin/application_settings/_help_page.html.haml
index fae4ef8286b..fbba8cae660 100644
--- a/app/views/admin/application_settings/_help_page.html.haml
+++ b/app/views/admin/application_settings/_help_page.html.haml
@@ -1,19 +1,19 @@
-= 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 :help_page_text, class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_area :help_page_text, class: 'form-control', rows: 4
         .form-text.text-muted Markdown enabled
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :help_page_hide_commercial_content do
             = f.check_box :help_page_hide_commercial_content
             Hide marketing-related entries from help
-    .form-group
+    .form-group.row
       = f.label :help_page_support_url, 'Support page URL', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :help_page_support_url, class: 'form-control', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block'
diff --git a/app/views/admin/application_settings/_influx.html.haml b/app/views/admin/application_settings/_influx.html.haml
index 51c9b3d534b..84ed00c350b 100644
--- a/app/views/admin/application_settings/_influx.html.haml
+++ b/app/views/admin/application_settings/_influx.html.haml
@@ -1,4 +1,4 @@
-= 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
@@ -8,17 +8,17 @@
       = link_to 'restart', help_page_path('administration/restart_gitlab')
       to take effect.
       = link_to icon('question-circle'), help_page_path('administration/monitoring/performance/introduction')
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :metrics_enabled do
             = f.check_box :metrics_enabled
             Enable InfluxDB Metrics
-    .form-group
+    .form-group.row
       = f.label :metrics_host, 'InfluxDB host', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com'
-    .form-group
+    .form-group.row
       = f.label :metrics_port, 'InfluxDB port', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :metrics_port, class: 'form-control', placeholder: '8089'
@@ -27,7 +27,7 @@
           your server configuration specifies a database to store data in when
           sending messages to this port, without it metrics data will not be
           saved.
-    .form-group
+    .form-group.row
       = f.label :metrics_pool_size, 'Connection pool size', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :metrics_pool_size, class: 'form-control'
@@ -36,28 +36,28 @@
           lazily. Users using multi-threaded application servers should ensure
           enough connections are available (at minimum the amount of application
           server threads).
-    .form-group
+    .form-group.row
       = f.label :metrics_timeout, 'Connection timeout', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :metrics_timeout, class: 'form-control'
         .form-text.text-muted
           The amount of seconds after which an InfluxDB connection will time
           out.
-    .form-group
+    .form-group.row
       = f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :metrics_method_call_threshold, class: 'form-control'
         .form-text.text-muted
           A method call is only tracked when it takes longer to complete than
           the given amount of milliseconds.
-    .form-group
+    .form-group.row
       = f.label :metrics_sample_interval, 'Sampler Interval (sec)', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :metrics_sample_interval, class: 'form-control'
         .form-text.text-muted
           The sampling interval in seconds. Sampled data includes memory usage,
           retained Ruby objects, file descriptors and so on.
-    .form-group
+    .form-group.row
       = f.label :metrics_packet_size, 'Metrics per packet', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :metrics_packet_size, class: 'form-control'
diff --git a/app/views/admin/application_settings/_ip_limits.html.haml b/app/views/admin/application_settings/_ip_limits.html.haml
index 5f7fdd08225..d9dc8634b9f 100644
--- a/app/views/admin/application_settings/_ip_limits.html.haml
+++ b/app/views/admin/application_settings/_ip_limits.html.haml
@@ -1,8 +1,8 @@
-= 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 :throttle_unauthenticated_enabled do
@@ -10,15 +10,15 @@
             Enable unauthenticated request rate limit
           %span.form-text.text-muted
             Helps reduce request volume (e.g. from crawlers or abusive bots)
-    .form-group
+    .form-group.row
       = f.label :throttle_unauthenticated_requests_per_period, 'Max requests per period per IP', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :throttle_unauthenticated_requests_per_period, class: 'form-control'
-    .form-group
+    .form-group.row
       = f.label :throttle_unauthenticated_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control'
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :throttle_authenticated_api_enabled do
@@ -26,15 +26,15 @@
             Enable authenticated API request rate limit
           %span.form-text.text-muted
             Helps reduce request volume (e.g. from crawlers or abusive bots)
-    .form-group
+    .form-group.row
       = f.label :throttle_authenticated_api_requests_per_period, 'Max requests per period per user', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :throttle_authenticated_api_requests_per_period, class: 'form-control'
-    .form-group
+    .form-group.row
       = f.label :throttle_authenticated_api_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control'
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :throttle_authenticated_web_enabled do
@@ -42,11 +42,11 @@
             Enable authenticated web request rate limit
           %span.form-text.text-muted
             Helps reduce request volume (e.g. from crawlers or abusive bots)
-    .form-group
+    .form-group.row
       = f.label :throttle_authenticated_web_requests_per_period, 'Max requests per period per user', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :throttle_authenticated_web_requests_per_period, class: 'form-control'
-    .form-group
+    .form-group.row
       = f.label :throttle_authenticated_web_period_in_seconds, 'Rate limit period in seconds', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control'
diff --git a/app/views/admin/application_settings/_koding.html.haml b/app/views/admin/application_settings/_koding.html.haml
index d084286d6c8..9d3cef89a47 100644
--- a/app/views/admin/application_settings/_koding.html.haml
+++ b/app/views/admin/application_settings/_koding.html.haml
@@ -1,8 +1,8 @@
-= 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 :koding_enabled do
@@ -10,7 +10,7 @@
             Enable Koding
         .form-text.text-muted
           Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again.
-    .form-group
+    .form-group.row
       = f.label :koding_url, 'Koding URL', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090'
diff --git a/app/views/admin/application_settings/_logging.html.haml b/app/views/admin/application_settings/_logging.html.haml
index 062787c6afd..e0f1a4a8799 100644
--- a/app/views/admin/application_settings/_logging.html.haml
+++ b/app/views/admin/application_settings/_logging.html.haml
@@ -1,8 +1,8 @@
-= 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 :sentry_enabled do
@@ -13,12 +13,12 @@
             Sentry is an error reporting and logging tool which is currently not shipped with GitLab, get it here:
             %a{ href: 'https://getsentry.com', target: '_blank', rel: 'noopener noreferrer' } https://getsentry.com
 
-    .form-group
+    .form-group.row
       = f.label :sentry_dsn, 'Sentry DSN', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :sentry_dsn, class: 'form-control'
 
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :clientside_sentry_enabled do
@@ -28,7 +28,7 @@
             Sentry can also be used for reporting and logging clientside exceptions.
             %a{ href: 'https://sentry.io/for/javascript/', target: '_blank', rel: 'noopener noreferrer' } https://sentry.io/for/javascript/
 
-    .form-group
+    .form-group.row
       = f.label :clientside_sentry_dsn, 'Clientside Sentry DSN', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :clientside_sentry_dsn, class: 'form-control'
diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml
index fdd549cd4a2..7a4adbd8d3b 100644
--- a/app/views/admin/application_settings/_outbound.html.haml
+++ b/app/views/admin/application_settings/_outbound.html.haml
@@ -1,8 +1,8 @@
-= 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 :allow_local_requests_from_hooks_and_services do
diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml
index 9f5044d4d1c..a7e0f288384 100644
--- a/app/views/admin/application_settings/_pages.html.haml
+++ b/app/views/admin/application_settings/_pages.html.haml
@@ -1,13 +1,13 @@
-= 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 :max_pages_size, 'Maximum size of pages (MB)', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.number_field :max_pages_size, class: 'form-control'
         .form-text.text-muted 0 for unlimited
-    .form-group
+    .form-group.row
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :pages_domain_verification_enabled do
diff --git a/app/views/admin/application_settings/_performance.html.haml b/app/views/admin/application_settings/_performance.html.haml
index 5b700d378e6..5473f45effc 100644
--- a/app/views/admin/application_settings/_performance.html.haml
+++ b/app/views/admin/application_settings/_performance.html.haml
@@ -1,8 +1,8 @@
-= 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 :authorized_keys_enabled do
diff --git a/app/views/admin/application_settings/_performance_bar.html.haml b/app/views/admin/application_settings/_performance_bar.html.haml
index c5551515172..66979d0eb0d 100644
--- a/app/views/admin/application_settings/_performance_bar.html.haml
+++ b/app/views/admin/application_settings/_performance_bar.html.haml
@@ -1,14 +1,14 @@
-= 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 :performance_bar_enabled do
             = f.check_box :performance_bar_enabled
             Enable the Performance Bar
-    .form-group
+    .form-group.row
       = f.label :performance_bar_allowed_group_id, 'Allowed group', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :performance_bar_allowed_group_id, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path
diff --git a/app/views/admin/application_settings/_plantuml.html.haml b/app/views/admin/application_settings/_plantuml.html.haml
index 7eb46c68842..68001f6d4a0 100644
--- a/app/views/admin/application_settings/_plantuml.html.haml
+++ b/app/views/admin/application_settings/_plantuml.html.haml
@@ -1,14 +1,14 @@
-= 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 :plantuml_enabled do
             = f.check_box :plantuml_enabled
             Enable PlantUML
-    .form-group
+    .form-group.row
       = f.label :plantuml_url, 'PlantUML URL', class: 'col-form-label col-sm-2'
       .col-sm-10
         = f.text_field :plantuml_url, class: 'form-control', placeholder: 'http://gitlab.your-plantuml-instance.com:8080'
diff --git a/app/views/admin/application_settings/_prometheus.html.haml b/app/views/admin/application_settings/_prometheus.html.haml
index 369efe40ff6..4b30a7890de 100644
--- a/app/views/admin/application_settings/_prometheus.html.haml
+++ b/app/views/admin/application_settings/_prometheus.html.haml
@@ -1,4 +1,4 @@
-= 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
diff --git a/app/views/admin/application_settings/_realtime.html.haml b/app/views/admin/application_settings/_realtime.html.haml
index 414b84c78fb..63a592cc2fd 100644
--- a/app/views/admin/application_settings/_realtime.html.haml
+++ b/app/views/admin/application_settings/_realtime.html.haml
@@ -1,8 +1,8 @@
-= 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'
diff --git a/app/views/admin/application_settings/_registry.html.haml b/app/views/admin/application_settings/_registry.html.haml
index 025ae0df12e..8524cbfe4d9 100644
--- a/app/views/admin/application_settings/_registry.html.haml
+++ b/app/views/admin/application_settings/_registry.html.haml
@@ -1,8 +1,8 @@
-= 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'
diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml
index 1ddf316f4cb..8d149bcbedb 100644
--- a/app/views/admin/application_settings/_repository_check.html.haml
+++ b/app/views/admin/application_settings/_repository_check.html.haml
@@ -1,10 +1,10 @@
-= 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'
diff --git a/app/views/admin/application_settings/_repository_storage.html.haml b/app/views/admin/application_settings/_repository_storage.html.haml
index 03bdb86fac2..5a9612b0ada 100644
--- a/app/views/admin/application_settings/_repository_storage.html.haml
+++ b/app/views/admin/application_settings/_repository_storage.html.haml
@@ -1,9 +1,9 @@
-= 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'
diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml
index bb7adf49b31..2ba1b92f37c 100644
--- a/app/views/admin/application_settings/_signin.html.haml
+++ b/app/views/admin/application_settings/_signin.html.haml
@@ -1,8 +1,8 @@
-= 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
diff --git a/app/views/admin/application_settings/_signup.html.haml b/app/views/admin/application_settings/_signup.html.haml
index c83d3e5ed09..42f92b81b58 100644
--- a/app/views/admin/application_settings/_signup.html.haml
+++ b/app/views/admin/application_settings/_signup.html.haml
@@ -1,32 +1,32 @@
-= 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
diff --git a/app/views/admin/application_settings/_spam.html.haml b/app/views/admin/application_settings/_spam.html.haml
index 50197211ac7..d421f6d3706 100644
--- a/app/views/admin/application_settings/_spam.html.haml
+++ b/app/views/admin/application_settings/_spam.html.haml
@@ -1,8 +1,8 @@
-= 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'
diff --git a/app/views/admin/application_settings/_terminal.html.haml b/app/views/admin/application_settings/_terminal.html.haml
index 70eabfcdae4..ae02d07e556 100644
--- a/app/views/admin/application_settings/_terminal.html.haml
+++ b/app/views/admin/application_settings/_terminal.html.haml
@@ -1,8 +1,8 @@
-= 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'
diff --git a/app/views/admin/application_settings/_usage.html.haml b/app/views/admin/application_settings/_usage.html.haml
index f5c3dcc3b41..8e5699b1761 100644
--- a/app/views/admin/application_settings/_usage.html.haml
+++ b/app/views/admin/application_settings/_usage.html.haml
@@ -1,8 +1,8 @@
-= 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
diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml
index 5506ceab58f..40a3250dca8 100644
--- a/app/views/admin/application_settings/_visibility_and_access.html.haml
+++ b/app/views/admin/application_settings/_visibility_and_access.html.haml
@@ -1,24 +1,24 @@
-= 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'
diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml
index ee6185847db..b5d79e1da13 100644
--- a/app/views/admin/applications/_form.html.haml
+++ b/app/views/admin/applications/_form.html.haml
@@ -1,4 +1,4 @@
-= 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
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml
index 5fe7b2eb7db..d558161ec8f 100644
--- a/app/views/admin/broadcast_messages/_form.html.haml
+++ b/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'
diff --git a/app/views/admin/deploy_keys/edit.html.haml b/app/views/admin/deploy_keys/edit.html.haml
index 3a59282e578..b50adef362f 100644
--- a/app/views/admin/deploy_keys/edit.html.haml
+++ b/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'
diff --git a/app/views/admin/deploy_keys/new.html.haml b/app/views/admin/deploy_keys/new.html.haml
index 13f5259698f..d4f8e340b69 100644
--- a/app/views/admin/deploy_keys/new.html.haml
+++ b/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'
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index 07be4a6fa19..6bc4333b60a 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -1,22 +1,22 @@
-= 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'
diff --git a/app/views/admin/hooks/edit.html.haml b/app/views/admin/hooks/edit.html.haml
index 9e1d456816d..b9a650e1f1f 100644
--- a/app/views/admin/hooks/edit.html.haml
+++ b/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'
diff --git a/app/views/admin/identities/_form.html.haml b/app/views/admin/identities/_form.html.haml
index 8a415c58ae6..12c6d43e654 100644
--- a/app/views/admin/identities/_form.html.haml
+++ b/app/views/admin/identities/_form.html.haml
@@ -1,12 +1,12 @@
-= 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
diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml
index aa41807dfcc..fb6108fd4ce 100644
--- a/app/views/admin/labels/_form.html.haml
+++ b/app/views/admin/labels/_form.html.haml
@@ -1,15 +1,15 @@
-= 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
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 2a809b9f772..561dc7a4f22 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/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'
 
diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml
index e5b8ebdf613..144dceacbdd 100644
--- a/app/views/admin/services/_form.html.haml
+++ b/app/views/admin/services/_form.html.haml
@@ -3,7 +3,7 @@
 
 %p #{@service.description} template
 
-= form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'form-horizontal fieldset-form' } do |form|
+= form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'fieldset-form' } do |form|
   = render 'shared/service_settings', form: form, subject: @service
 
   .footer-block.row-content-block
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 1c8781b79fd..6daccc359e1 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -1,20 +1,20 @@
 .user_new
-  = form_for [:admin, @user], html: { class: 'form-horizontal fieldset-form' } do |f|
+  = form_for [:admin, @user], html: { class: 'fieldset-form' } do |f|
     = form_errors(@user)
 
     %fieldset
       %legend Account
-      .form-group
+      .form-group.row
         = f.label :name, class: 'col-form-label'
         .col-sm-10
           = f.text_field :name, required: true, autocomplete: 'off', class: 'form-control'
           %span.help-inline * required
-      .form-group
+      .form-group.row
         = f.label :username, class: 'col-form-label'
         .col-sm-10
           = f.text_field :username, required: true, autocomplete: 'off', autocorrect: 'off', autocapitalize: 'off', spellcheck: false, class: 'form-control'
           %span.help-inline * required
-      .form-group
+      .form-group.row
         = f.label :email, class: 'col-form-label'
         .col-sm-10
           = f.text_field :email, required: true, autocomplete: 'off', class: 'form-control'
@@ -23,7 +23,7 @@
     - if @user.new_record?
       %fieldset
         %legend Password
-        .form-group
+        .form-group.row
           = f.label :password, class: 'col-form-label'
           .col-sm-10
             %strong
@@ -33,10 +33,10 @@
     - else
       %fieldset
         %legend Password
-        .form-group
+        .form-group.row
           = f.label :password, class: 'col-form-label'
           .col-sm-10= f.password_field :password, disabled: f.object.force_random_password, class: 'form-control'
-        .form-group
+        .form-group.row
           = f.label :password_confirmation, class: 'col-form-label'
           .col-sm-10= f.password_field :password_confirmation, disabled: f.object.force_random_password, class: 'form-control'
 
@@ -44,21 +44,21 @@
 
     %fieldset
       %legend Profile
-      .form-group
+      .form-group.row
         = f.label :avatar, class: 'col-form-label'
         .col-sm-10
           = f.file_field :avatar
 
-      .form-group
+      .form-group.row
         = f.label :skype, class: 'col-form-label'
         .col-sm-10= f.text_field :skype, class: 'form-control'
-      .form-group
+      .form-group.row
         = f.label :linkedin, class: 'col-form-label'
         .col-sm-10= f.text_field :linkedin, class: 'form-control'
-      .form-group
+      .form-group.row
         = f.label :twitter, class: 'col-form-label'
         .col-sm-10= f.text_field :twitter, class: 'form-control'
-      .form-group
+      .form-group.row
         = f.label :website_url, 'Website', class: 'col-form-label'
         .col-sm-10= f.text_field :website_url, class: 'form-control'
 
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index a508e4ccbc2..0ee24283e00 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -3,11 +3,11 @@
   .card-header
     Group settings
   .card-body
-    = form_for @group, html: { multipart: true, class: "form-horizontal gl-show-field-errors" }, authenticity_token: true do |f|
+    = form_for @group, html: { multipart: true, class: "gl-show-field-errors" }, authenticity_token: true do |f|
       = form_errors(@group)
       = render 'shared/group_form', f: f
 
-      .form-group
+      .form-group.row
         .col-sm-offset-2.col-sm-10
           .avatar-container.s160
             = group_icon(@group, alt: '', class: 'avatar group-avatar s160')
@@ -23,11 +23,11 @@
 
       = render 'shared/visibility_level', f: f, visibility_level: @group.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
 
-      .form-group
+      .form-group.row
         %label.col-form-label
           = s_("GroupSettings|Share with group lock")
         .col-sm-10
@@ -62,7 +62,7 @@
     .card-header Transfer group
     .card-body
       = form_for @group, url: transfer_group_path(@group), method: :put do |f|
-        .form-group
+        .form-group.row
           = dropdown_tag('Select parent group', options: { toggle_class: 'js-groups-dropdown', title: 'Parent Group', filter: true, dropdown_class: 'dropdown-open-top dropdown-group-transfer', placeholder: "Search groups", data: { data: parent_group_options(@group) } })
           = hidden_field_tag 'new_parent_group_id'
 
diff --git a/app/views/groups/milestones/_form.html.haml b/app/views/groups/milestones/_form.html.haml
index 8d30cf95e3f..7a136bc0e24 100644
--- a/app/views/groups/milestones/_form.html.haml
+++ b/app/views/groups/milestones/_form.html.haml
@@ -1,13 +1,13 @@
-= form_for [@group, @milestone], html: { class: 'form-horizontal milestone-form common-note-form js-quick-submit js-requires-input' }  do |f|
+= form_for [@group, @milestone], html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' }  do |f|
   .row
     = form_errors(@milestone)
 
     .col-md-6
-      .form-group
+      .form-group.row
         = f.label :title, "Title", class: "col-form-label"
         .col-sm-10
           = f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true
-      .form-group.milestone-description
+      .form-group.row.milestone-description
         = f.label :description, "Description", class: "col-form-label"
         .col-sm-10
           = render layout: 'projects/md_preview', locals: { url: group_preview_markdown_path } do
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 9b9a16a2fd5..f750a1b0233 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -8,11 +8,11 @@
   New Group
 %hr
 
-= form_for @group, html: { class: 'group-form form-horizontal gl-show-field-errors' } do |f|
+= form_for @group, html: { class: 'group-form gl-show-field-errors' } do |f|
   = form_errors(@group)
   = render 'shared/group_form', f: f, autofocus: true
 
-  .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
@@ -21,7 +21,7 @@
 
   = render 'create_chat_team', f: f if Gitlab.config.mattermost.enabled
 
-  .form-group
+  .form-group.row
     .col-sm-offset-2.col-sm-10
       = render 'shared/group_tips'
 
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml
index ffb84dd6cc4..c53069de2bd 100644
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -461,22 +461,22 @@
     %code form.horizontal-form
 
   .example
-    %form.form-horizontal
-      .form-group
+    %form
+      .form-group.row
         %label.col-sm-2.col-form-label{ :for => "inputEmail3" } Email
         .col-sm-10
           %input#inputEmail3.form-control{ :placeholder => "Email", :type => "email" }/
-      .form-group
+      .form-group.row
         %label.col-sm-2.col-form-label{ :for => "inputPassword3" } Password
         .col-sm-10
           %input#inputPassword3.form-control{ :placeholder => "Password", :type => "password" }/
-      .form-group
+      .form-group.row
         .col-sm-offset-2.col-sm-10
           .form-check
             %label
               %input{ :type => "checkbox" }/
               Remember me
-      .form-group
+      .form-group.row
         .col-sm-offset-2.col-sm-10
           %button.btn.btn-secondary{ :type => "submit" } Sign in
 
diff --git a/app/views/import/fogbugz/new.html.haml b/app/views/import/fogbugz/new.html.haml
index 6a0c5d99a11..2215903f53f 100644
--- a/app/views/import/fogbugz/new.html.haml
+++ b/app/views/import/fogbugz/new.html.haml
@@ -5,20 +5,20 @@
   Import projects from FogBugz
 %hr
 
-= form_tag callback_import_fogbugz_path, class: 'form-horizontal' do
+= form_tag callback_import_fogbugz_path do
   %p
     To get started you enter your FogBugz URL and login information below.
     In the next steps, you'll be able to map users and select the projects
     you want to import.
-  .form-group
+  .form-group.row
     = label_tag :uri, 'FogBugz URL', class: 'col-form-label'
     .col-sm-4
       = text_field_tag :uri, nil, placeholder: 'https://mycompany.fogbugz.com', class: 'form-control'
-  .form-group
+  .form-group.row
     = label_tag :email, 'FogBugz Email', class: 'col-form-label'
     .col-sm-4
       = text_field_tag :email, nil, class: 'form-control'
-  .form-group
+  .form-group.row
     = label_tag :password, 'FogBugz Password', class: 'col-form-label'
     .col-sm-4
       = password_field_tag :password, nil, class: 'form-control'
diff --git a/app/views/import/fogbugz/new_user_map.html.haml b/app/views/import/fogbugz/new_user_map.html.haml
index 84e0009487f..d27c5d3c36d 100644
--- a/app/views/import/fogbugz/new_user_map.html.haml
+++ b/app/views/import/fogbugz/new_user_map.html.haml
@@ -5,7 +5,7 @@
   Import projects from FogBugz
 %hr
 
-= form_tag create_user_map_import_fogbugz_path, class: 'form-horizontal' do
+= form_tag create_user_map_import_fogbugz_path do
   %p
     Customize how FogBugz email addresses and usernames are imported into GitLab.
     In the next step, you'll be able to select the projects you want to import.
diff --git a/app/views/import/gitea/new.html.haml b/app/views/import/gitea/new.html.haml
index 228b14c9be0..a21e1dd118a 100644
--- a/app/views/import/gitea/new.html.haml
+++ b/app/views/import/gitea/new.html.haml
@@ -10,12 +10,12 @@
   = succeed '.' do
     = link_to 'Personal Access Token', 'https://github.com/gogits/go-gogs-client/wiki#access-token'
 
-= form_tag personal_access_token_import_gitea_path, class: 'form-horizontal' do
-  .form-group
+= form_tag personal_access_token_import_gitea_path do
+  .form-group.row
     = label_tag :gitea_host_url, 'Gitea Host URL', class: 'col-form-label'
     .col-sm-4
       = text_field_tag :gitea_host_url, nil, placeholder: 'https://try.gitea.io', class: 'form-control'
-  .form-group
+  .form-group.row
     = label_tag :personal_access_token, 'Personal Access Token', class: 'col-form-label'
     .col-sm-4
       = text_field_tag :personal_access_token, nil, class: 'form-control'
diff --git a/app/views/import/google_code/new.html.haml b/app/views/import/google_code/new.html.haml
index c5800a1cca0..2f1fb8d9c56 100644
--- a/app/views/import/google_code/new.html.haml
+++ b/app/views/import/google_code/new.html.haml
@@ -5,7 +5,7 @@
   Import projects from Google Code
 %hr
 
-= form_tag callback_import_google_code_path, class: 'form-horizontal', multipart: true do
+= form_tag callback_import_google_code_path, multipart: true do
   %p
     Follow the steps below to export your Google Code project data.
     In the next step, you'll be able to select the projects you want to import.
diff --git a/app/views/import/google_code/new_user_map.html.haml b/app/views/import/google_code/new_user_map.html.haml
index 0738b3db1eb..91c774f575c 100644
--- a/app/views/import/google_code/new_user_map.html.haml
+++ b/app/views/import/google_code/new_user_map.html.haml
@@ -5,7 +5,7 @@
   Import projects from Google Code
 %hr
 
-= form_tag create_user_map_import_google_code_path, class: 'form-horizontal' do
+= form_tag create_user_map_import_google_code_path do
   %p
     Customize how Google Code email addresses and usernames are imported into GitLab.
     In the next step, you'll be able to select the projects you want to import.
@@ -36,7 +36,7 @@
         will add "By <a href="#">johnsmith@example.com</a>" to all issues and comments originally created by johnsmith@example.com.
         By default, the email address or username is masked to ensure the user's privacy. Use this option if you want to show the full email address.
 
-  .form-group
+  .form-group.row
     .col-sm-12
       = text_area_tag :user_map, JSON.pretty_generate(@user_map), class: 'form-control', rows: 15
 
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml
index 1242274e6a9..11c70862aef 100644
--- a/app/views/profiles/passwords/new.html.haml
+++ b/app/views/profiles/passwords/new.html.haml
@@ -2,7 +2,7 @@
 - header_title  "New Password"
 %h3.page-title Setup new password
 %hr
-= form_for @user, url: profile_password_path, method: :post, html: { class: 'form-horizontal '} do |f|
+= form_for @user, url: profile_password_path, method: :post do |f|
   %p.slead
     Please set a new password before proceeding.
     %br
@@ -11,13 +11,13 @@
   = form_errors(@user)
 
   - unless @user.password_automatically_set?
-    .form-group
+    .form-group.row
       = f.label :current_password, class: 'col-form-label'
       .col-sm-10= f.password_field :current_password, required: true, class: 'form-control'
-  .form-group
+  .form-group.row
     = f.label :password, class: 'col-form-label'
     .col-sm-10= f.password_field :password, required: true, class: 'form-control'
-  .form-group
+  .form-group.row
     = f.label :password_confirmation, class: 'col-form-label'
     .col-sm-10
       = f.password_field :password_confirmation, required: true, class: 'form-control'
diff --git a/app/views/projects/blob/_new_dir.html.haml b/app/views/projects/blob/_new_dir.html.haml
index c344daa4063..831dba0e4c9 100644
--- a/app/views/projects/blob/_new_dir.html.haml
+++ b/app/views/projects/blob/_new_dir.html.haml
@@ -5,8 +5,8 @@
         %a.close{ href: "#", "data-dismiss" => "modal" } ×
         %h3.page-title= _('Create New Directory')
       .modal-body
-        = form_tag project_create_dir_path(@project, @id), method: :post, remote: false, class: 'form-horizontal js-create-dir-form js-quick-submit js-requires-input' do
-          .form-group
+        = form_tag project_create_dir_path(@project, @id), method: :post, remote: false, class: 'js-create-dir-form js-quick-submit js-requires-input' do
+          .form-group.row
             = label_tag :dir_name, _('Directory name'), class: 'col-form-label'
             .col-sm-10
               = text_field_tag :dir_name, params[:dir_name], required: true, class: 'form-control'
diff --git a/app/views/projects/blob/_remove.html.haml b/app/views/projects/blob/_remove.html.haml
index 750bdef3308..55cd516d399 100644
--- a/app/views/projects/blob/_remove.html.haml
+++ b/app/views/projects/blob/_remove.html.haml
@@ -6,10 +6,10 @@
         %h3.page-title Delete #{@blob.name}
 
       .modal-body
-        = form_tag project_blob_path(@project, @id), method: :delete, class: 'form-horizontal js-delete-blob-form js-quick-submit js-requires-input' do
+        = form_tag project_blob_path(@project, @id), method: :delete, class: 'js-delete-blob-form js-quick-submit js-requires-input' do
           = render 'shared/new_commit_form', placeholder: "Delete #{@blob.name}"
 
-          .form-group
+          .form-group.row
             .col-sm-offset-2.col-sm-10
               = button_tag 'Delete file', class: 'btn btn-remove btn-remove-file'
               = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
diff --git a/app/views/projects/blob/_upload.html.haml b/app/views/projects/blob/_upload.html.haml
index 182d02376bf..60a49441ce8 100644
--- a/app/views/projects/blob/_upload.html.haml
+++ b/app/views/projects/blob/_upload.html.haml
@@ -5,7 +5,7 @@
         %a.close{ href: "#", "data-dismiss" => "modal" } &times;
         %h3.page-title= title
       .modal-body
-        = form_tag form_path, method: method, class: 'js-quick-submit js-upload-blob-form form-horizontal', data: { method: method } do
+        = form_tag form_path, method: method, class: 'js-quick-submit js-upload-blob-form', data: { method: method } do
           .dropzone
             .dropzone-previews.blob-upload-dropzone-previews
               %p.dz-message.light
diff --git a/app/views/projects/blob/edit.html.haml b/app/views/projects/blob/edit.html.haml
index 9d90251ab66..c6c9105aae6 100644
--- a/app/views/projects/blob/edit.html.haml
+++ b/app/views/projects/blob/edit.html.haml
@@ -24,7 +24,7 @@
         = link_to '#preview', 'data-preview-url' => project_preview_blob_path(@project, @id) do
           = editing_preview_title(@blob.name)
 
-    = form_tag(project_update_blob_path(@project, @id), method: :put, class: 'form-horizontal js-quick-submit js-requires-input js-edit-blob-form', data: blob_editor_paths) do
+    = form_tag(project_update_blob_path(@project, @id), method: :put, class: 'js-quick-submit js-requires-input js-edit-blob-form', data: blob_editor_paths) do
       = render 'projects/blob/editor', ref: @ref, path: @path, blob_data: @blob.data
       = render 'shared/new_commit_form', placeholder: "Update #{@blob.name}"
       = hidden_field_tag 'last_commit_sha', @last_commit_sha
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml
index fa091d8f6ef..39442564a2b 100644
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
@@ -7,7 +7,7 @@
     New file
   = render 'template_selectors'
 .file-editor
-  = form_tag(project_create_blob_path(@project, @id), method: :post, class: 'form-horizontal js-edit-blob-form js-new-blob-form js-quick-submit js-requires-input', data: blob_editor_paths) do
+  = form_tag(project_create_blob_path(@project, @id), method: :post, class: 'js-edit-blob-form js-new-blob-form js-quick-submit js-requires-input', data: blob_editor_paths) do
     = render 'projects/blob/editor', ref: @ref
     = render 'shared/new_commit_form', placeholder: "Add new file"
 
diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml
index d77ef749d79..40c1b3d8199 100644
--- a/app/views/projects/branches/new.html.haml
+++ b/app/views/projects/branches/new.html.haml
@@ -9,13 +9,13 @@
   New Branch
 %hr
 
-= form_tag namespace_project_branches_path, method: :post, id: "new-branch-form", class: "form-horizontal js-create-branch-form js-requires-input" do
-  .form-group
+= form_tag namespace_project_branches_path, method: :post, id: "new-branch-form", class: "js-create-branch-form js-requires-input" do
+  .form-group.row
     = label_tag :branch_name, nil, class: 'col-form-label'
     .col-sm-10
       = text_field_tag :branch_name, params[:branch_name], required: true, autofocus: true, class: 'form-control js-branch-name'
       .form-text.text-muted.text-danger.js-branch-name-error
-  .form-group
+  .form-group.row
     = label_tag :ref, 'Create from', class: 'col-form-label'
     .col-sm-10.create-from
       .dropdown
diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml
index 64abd1c254b..4cec612ab1c 100644
--- a/app/views/projects/commit/_change.html.haml
+++ b/app/views/projects/commit/_change.html.haml
@@ -20,8 +20,8 @@
       .modal-body
         - if description
           %p.append-bottom-20= description
-        = form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "form-horizontal js-#{type}-form js-requires-input" do
-          .form-group.branch
+        = form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "js-#{type}-form js-requires-input" do
+          .form-group.row.branch
             = label_tag 'start_branch', branch_label, class: 'col-form-label'
             .col-sm-10
               = hidden_field_tag :start_branch, @project.default_branch, id: 'start_branch'
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
index 5bdb57a3ae2..307760b837f 100644
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -1,23 +1,23 @@
 = form_for [@project.namespace.becomes(Namespace), @project, @deploy_keys.new_key], url: namespace_project_deploy_keys_path, html: { class: "js-requires-input" } do |f|
   = form_errors(@deploy_keys.new_key)
-  .form-group
+  .form-group.row
     = f.label :title, class: "label-light"
     = f.text_field :title, class: 'form-control', required: true
-  .form-group
+  .form-group.row
     = f.label :key, class: "label-light"
     = f.text_area :key, class: "form-control", rows: 5, required: true
-  .form-group
+  .form-group.row
     %p.light.append-bottom-0
       Paste a machine public key here. Read more about how to generate it
       = link_to "here", help_page_path("ssh/README")
 
   = f.fields_for :deploy_keys_projects do |deploy_keys_project_form|
-    .form-group
+    .form-group.row
       .form-check
         = deploy_keys_project_form.label :can_push do
           = deploy_keys_project_form.check_box :can_push
           %strong Write access allowed
-    .form-group
+    .form-group.row
       %p.light.append-bottom-0
         Allow this key to push to repository as well? (Default only allows pull access.)
 
diff --git a/app/views/projects/deploy_keys/edit.html.haml b/app/views/projects/deploy_keys/edit.html.haml
index cd910b82b57..e009b6fef0e 100644
--- a/app/views/projects/deploy_keys/edit.html.haml
+++ b/app/views/projects/deploy_keys/edit.html.haml
@@ -3,7 +3,7 @@
 %hr
 
 %div
-  = form_for [@project.namespace.becomes(Namespace), @project, @deploy_key], html: { class: 'form-horizontal js-requires-input' } do |f|
+  = form_for [@project.namespace.becomes(Namespace), @project, @deploy_key], html: { class: 'js-requires-input' } 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'
diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml
index 3ff4e160a4d..16c4f21279d 100644
--- a/app/views/projects/imports/new.html.haml
+++ b/app/views/projects/imports/new.html.haml
@@ -12,7 +12,7 @@
         :preserve
           #{h(sanitize_repo_path(@project, @project.import_error))}
 
-= form_for @project, url: project_import_path(@project), method: :post, html: { class: 'form-horizontal' } do |f|
+= form_for @project, url: project_import_path(@project), method: :post do |f|
   = render "shared/import_form", f: f
 
   .form-actions
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index 8b011af78eb..2c5ffd85372 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -1,2 +1,2 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @issue], html: { class: 'form-horizontal issue-form common-note-form js-quick-submit js-requires-input' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @issue], html: { class: 'issue-form common-note-form js-quick-submit js-requires-input' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @issue
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 9607a7b5d06..179c1fcc684 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -1,2 +1,2 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal common-note-form js-requires-input js-quick-submit' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form common-note-form js-requires-input js-quick-submit' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @merge_request
diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
index 092090462c9..fa67a80307c 100644
--- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
@@ -1,12 +1,12 @@
-.form-horizontal.resolve-conflicts-form
-  .form-group
+.resolve-conflicts-form
+  .form-group.row
     %label.col-sm-2.col-form-label{ "for" => "commit-message" }
       #{ _('Commit message') }
     .col-sm-10
       .commit-message-container
         .max-width-marker
         %textarea.form-control.js-commit-message#commit-message{ "v-model" => "conflictsData.commitMessage", "rows" => "5" }
-  .form-group
+  .form-group.row
     .col-sm-offset-2.col-sm-10
       .row
         .col-6
diff --git a/app/views/projects/merge_requests/creations/_new_submit.html.haml b/app/views/projects/merge_requests/creations/_new_submit.html.haml
index 23faa954d16..8f6adf56b3b 100644
--- a/app/views/projects/merge_requests/creations/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/creations/_new_submit.html.haml
@@ -10,7 +10,7 @@
   %span.float-right
     = link_to 'Change branches', mr_change_branches_path(@merge_request)
 %hr
-= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal common-note-form js-requires-input js-quick-submit' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form common-note-form js-requires-input js-quick-submit' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @merge_request, commits: @commits
   = f.hidden_field :source_project_id
   = f.hidden_field :source_branch
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 10b5c7d20a5..41a82971a2a 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -1,12 +1,12 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @milestone], html: {class: 'form-horizontal milestone-form common-note-form js-quick-submit js-requires-input'}  do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @milestone], html: {class: 'milestone-form common-note-form js-quick-submit js-requires-input'}  do |f|
   = form_errors(@milestone)
   .row
     .col-md-6
-      .form-group
+      .form-group.row
         = f.label :title, "Title", class: "col-form-label"
         .col-sm-10
           = f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true
-      .form-group.milestone-description
+      .form-group.row.milestone-description
         = f.label :description, "Description", class: "col-form-label"
         .col-sm-10
           = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project) } do
diff --git a/app/views/projects/pages_domains/_form.html.haml b/app/views/projects/pages_domains/_form.html.haml
index acfb332cc0f..3b0ff81b58f 100644
--- a/app/views/projects/pages_domains/_form.html.haml
+++ b/app/views/projects/pages_domains/_form.html.haml
@@ -4,21 +4,21 @@
       - @domain.errors.full_messages.each do |msg|
         %p= msg
 
-.form-group
+.form-group.row
   = f.label :domain, class: 'col-form-label' do
     Domain
   .col-sm-10
     = f.text_field :domain, required: true, autocomplete: 'off', class: 'form-control', disabled: @domain.persisted?
 
 - if Gitlab.config.pages.external_https
-  .form-group
+  .form-group.row
     = f.label :certificate, class: 'col-form-label' do
       Certificate (PEM)
     .col-sm-10
       = f.text_area :certificate, rows: 5, class: 'form-control'
       %span.help-inline Upload a certificate for your domain with all intermediates
 
-  .form-group
+  .form-group.row
     = f.label :key, class: 'col-form-label' do
       Key (PEM)
     .col-sm-10
diff --git a/app/views/projects/pages_domains/edit.html.haml b/app/views/projects/pages_domains/edit.html.haml
index 6c404990492..ee70de22f13 100644
--- a/app/views/projects/pages_domains/edit.html.haml
+++ b/app/views/projects/pages_domains/edit.html.haml
@@ -5,7 +5,7 @@
   = @domain.domain
 %hr.clearfix
 %div
-  = form_for [@project.namespace.becomes(Namespace), @project, @domain], html: { class: 'form-horizontal fieldset-form' } do |f|
+  = form_for [@project.namespace.becomes(Namespace), @project, @domain], html: { class: 'fieldset-form' } do |f|
     = render 'form', { f: f }
     .form-actions
       = f.submit 'Save Changes', class: "btn btn-save"
diff --git a/app/views/projects/pages_domains/new.html.haml b/app/views/projects/pages_domains/new.html.haml
index 08027740402..376ce3f68aa 100644
--- a/app/views/projects/pages_domains/new.html.haml
+++ b/app/views/projects/pages_domains/new.html.haml
@@ -4,7 +4,7 @@
   New Pages Domain
 %hr.clearfix
 %div
-  = form_for [@project.namespace.becomes(Namespace), @project, @domain], html: { class: 'form-horizontal fieldset-form' } do |f|
+  = form_for [@project.namespace.becomes(Namespace), @project, @domain], html: { class: 'fieldset-form' } do |f|
     = render 'form', { f: f }
     .form-actions
       = f.submit 'Create New Domain', class: "btn btn-save"
diff --git a/app/views/projects/pipeline_schedules/_form.html.haml b/app/views/projects/pipeline_schedules/_form.html.haml
index 160e325996a..1cdf981fcb4 100644
--- a/app/views/projects/pipeline_schedules/_form.html.haml
+++ b/app/views/projects/pipeline_schedules/_form.html.haml
@@ -1,24 +1,24 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @schedule], as: :schedule, html: { id: "new-pipeline-schedule-form", class: "form-horizontal js-pipeline-schedule-form" } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @schedule], as: :schedule, html: { id: "new-pipeline-schedule-form", class: "js-pipeline-schedule-form" } do |f|
   = form_errors(@schedule)
-  .form-group
+  .form-group.row
     .col-md-9
       = f.label :description, _('Description'), class: 'label-light'
       = f.text_field :description, class: 'form-control', required: true, autofocus: true, placeholder: s_('PipelineSchedules|Provide a short description for this pipeline')
-  .form-group
+  .form-group.row
     .col-md-9
       = f.label :cron, _('Interval Pattern'), class: 'label-light'
       #interval-pattern-input{ data: { initial_interval: @schedule.cron } }
-  .form-group
+  .form-group.row
     .col-md-9
       = f.label :cron_timezone, _('Cron Timezone'), class: 'label-light'
       = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'btn js-timezone-dropdown', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } )
       = f.text_field :cron_timezone, value: @schedule.cron_timezone, id: 'schedule_cron_timezone', class: 'hidden', name: 'schedule[cron_timezone]', required: true
-  .form-group
+  .form-group.row
     .col-md-9
       = f.label :ref, _('Target Branch'), class: 'label-light'
       = dropdown_tag(_("Select target branch"), options: { toggle_class: 'btn js-target-branch-dropdown', dropdown_class: 'git-revision-dropdown', title: _("Select target branch"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: @project.repository.branch_names, default_branch: @project.default_branch } } )
       = f.text_field :ref, value: @schedule.ref, id: 'schedule_ref', class: 'hidden', name: 'schedule[ref]', required: true
-  .form-group.js-ci-variable-list-section
+  .form-group.row.js-ci-variable-list-section
     .col-md-9
       %label.label-light
         #{ s_('PipelineSchedules|Variables') }
@@ -32,7 +32,7 @@
             = n_('Hide value', 'Hide values', @schedule.variables.size)
           - else
             = n_('Reveal value', 'Reveal values', @schedule.variables.size)
-  .form-group
+  .form-group.row
     .col-md-9
       = f.label  :active, s_('PipelineSchedules|Activated'), class: 'label-light'
       %div
diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml
index 3d5943e544e..0c9d1c7a26f 100644
--- a/app/views/projects/pipelines/new.html.haml
+++ b/app/views/projects/pipelines/new.html.haml
@@ -5,9 +5,9 @@
   New Pipeline
 %hr
 
-= form_for @pipeline, as: :pipeline, url: project_pipelines_path(@project), html: { id: "new-pipeline-form", class: "form-horizontal js-new-pipeline-form js-requires-input" } do |f|
+= form_for @pipeline, as: :pipeline, url: project_pipelines_path(@project), html: { id: "new-pipeline-form", class: "js-new-pipeline-form js-requires-input" } do |f|
   = form_errors(@pipeline)
-  .form-group
+  .form-group.row
     = f.label :ref, 'Create for', class: 'col-form-label'
     .col-sm-10
       = hidden_field_tag 'pipeline[ref]', params[:ref] || @project.default_branch
diff --git a/app/views/projects/project_members/import.html.haml b/app/views/projects/project_members/import.html.haml
index 7691d432e30..c9d850e392f 100644
--- a/app/views/projects/project_members/import.html.haml
+++ b/app/views/projects/project_members/import.html.haml
@@ -5,8 +5,8 @@
 %p.light
   Only project members will be imported. Group members will be skipped.
 %hr
-= form_tag apply_import_project_project_members_path(@project), method: 'post', class: 'form-horizontal' do
-  .form-group
+= form_tag apply_import_project_project_members_path(@project), method: 'post' do
+  .form-group.row
     = label_tag :source_project_id, "Project", class: 'col-form-label'
     .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(@projects, :id, :name_with_namespace), prompt: "Select project", class: "select2 lg", required: true)
 
diff --git a/app/views/projects/protected_branches/shared/_create_protected_branch.html.haml b/app/views/projects/protected_branches/shared/_create_protected_branch.html.haml
index 02ac244e080..c2d6c034e35 100644
--- a/app/views/projects/protected_branches/shared/_create_protected_branch.html.haml
+++ b/app/views/projects/protected_branches/shared/_create_protected_branch.html.haml
@@ -4,30 +4,29 @@
       %h3.card-title
         Protect a branch
     .card-body
-      .form-horizontal
-        = form_errors(@protected_branch)
-        .form-group
-          = f.label :name, class: 'col-md-2 text-right' do
-            Branch:
-          .col-md-10
-            = render partial: "projects/protected_branches/shared/dropdown", locals: { f: f }
-            .form-text.text-muted
-              = link_to 'Wildcards', help_page_path('user/project/protected_branches', anchor: 'wildcard-protected-branches')
-              such as
-              %code *-stable
-              or
-              %code production/*
-              are supported
-        .form-group
-          %label.col-md-2.text-right{ for: 'merge_access_levels_attributes' }
-            Allowed to merge:
-          .col-md-10
-            = yield :merge_access_levels
-        .form-group
-          %label.col-md-2.text-right{ for: 'push_access_levels_attributes' }
-            Allowed to push:
-          .col-md-10
-            = yield :push_access_levels
+      = form_errors(@protected_branch)
+      .form-group.row
+        = f.label :name, class: 'col-md-2 text-right' do
+          Branch:
+        .col-md-10
+          = render partial: "projects/protected_branches/shared/dropdown", locals: { f: f }
+          .form-text.text-muted
+            = link_to 'Wildcards', help_page_path('user/project/protected_branches', anchor: 'wildcard-protected-branches')
+            such as
+            %code *-stable
+            or
+            %code production/*
+            are supported
+      .form-group.row
+        %label.col-md-2.text-right{ for: 'merge_access_levels_attributes' }
+          Allowed to merge:
+        .col-md-10
+          = yield :merge_access_levels
+      .form-group.row
+        %label.col-md-2.text-right{ for: 'push_access_levels_attributes' }
+          Allowed to push:
+        .col-md-10
+          = yield :push_access_levels
 
     .card-footer
       = f.submit 'Protect', class: 'btn-create btn', disabled: true
diff --git a/app/views/projects/protected_tags/shared/_create_protected_tag.html.haml b/app/views/projects/protected_tags/shared/_create_protected_tag.html.haml
index 36ef4ac21e5..0ae5ca3ff36 100644
--- a/app/views/projects/protected_tags/shared/_create_protected_tag.html.haml
+++ b/app/views/projects/protected_tags/shared/_create_protected_tag.html.haml
@@ -4,26 +4,25 @@
       %h3.card-title
         Protect a tag
     .card-body
-      .form-horizontal
-        = form_errors(@protected_tag)
-        .form-group
-          = f.label :name, class: 'col-md-2 text-right' do
-            Tag:
-          .col-md-10.protected-tags-dropdown
-            = render partial: "projects/protected_tags/shared/dropdown", locals: { f: f }
-            .form-text.text-muted
-              = link_to 'Wildcards', help_page_path('user/project/protected_tags', anchor: 'wildcard-protected-tags')
-              such as
-              %code v*
-              or
-              %code *-release
-              are supported
-        .form-group
-          %label.col-md-2.text-right{ for: 'create_access_levels_attributes' }
-            Allowed to create:
-          .col-md-10
-            .create_access_levels-container
-              = yield :create_access_levels
+      = form_errors(@protected_tag)
+      .form-group.row
+        = f.label :name, class: 'col-md-2 text-right' do
+          Tag:
+        .col-md-10.protected-tags-dropdown
+          = render partial: "projects/protected_tags/shared/dropdown", locals: { f: f }
+          .form-text.text-muted
+            = link_to 'Wildcards', help_page_path('user/project/protected_tags', anchor: 'wildcard-protected-tags')
+            such as
+            %code v*
+            or
+            %code *-release
+            are supported
+      .form-group.row
+        %label.col-md-2.text-right{ for: 'create_access_levels_attributes' }
+          Allowed to create:
+        .col-md-10
+          .create_access_levels-container
+            = yield :create_access_levels
 
     .card-footer
       = f.submit 'Protect', class: 'btn-create btn', disabled: true
diff --git a/app/views/projects/releases/edit.html.haml b/app/views/projects/releases/edit.html.haml
index 586eec70f5d..936c2d0efbc 100644
--- a/app/views/projects/releases/edit.html.haml
+++ b/app/views/projects/releases/edit.html.haml
@@ -11,7 +11,7 @@
         %strong= @tag.name
 
 
-  = form_for(@release, method: :put, url: project_tag_release_path(@project, @tag.name), html: { class: 'form-horizontal common-note-form release-form js-quick-submit' }) do |f|
+  = form_for(@release, method: :put, url: project_tag_release_path(@project, @tag.name), html: { class: 'common-note-form release-form js-quick-submit' }) do |f|
     = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project), referenced_users: true } do
       = render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: "Write your release notes or drag files here..."
       = render 'shared/notes/hints'
diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml
index f09672ad8fc..e44b4673557 100644
--- a/app/views/projects/runners/_form.html.haml
+++ b/app/views/projects/runners/_form.html.haml
@@ -1,51 +1,51 @@
-= form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f|
+= form_for runner, url: runner_form_url do |f|
   = form_errors(runner)
-  .form-group
+  .form-group.row
     = label :active, "Active", class: 'col-form-label'
     .col-sm-10
       .form-check
         = f.check_box :active
         %span.light Paused Runners don't accept new jobs
-  .form-group
+  .form-group.row
     = label :protected, "Protected", class: 'col-form-label'
     .col-sm-10
       .form-check
         = f.check_box :access_level, {}, 'ref_protected', 'not_protected'
         %span.light This runner will only run on pipelines triggered on protected branches
-  .form-group
+  .form-group.row
     = label :run_untagged, 'Run untagged jobs', class: 'col-form-label'
     .col-sm-10
       .form-check
         = f.check_box :run_untagged
         %span.light Indicates whether this runner can pick jobs without tags
-  .form-group
+  .form-group.row
     = label :locked, 'Lock to current projects', class: 'col-form-label'
     .col-sm-10
       .form-check
         = f.check_box :locked
         %span.light When a runner is locked, it cannot be assigned to other projects
-  .form-group
+  .form-group.row
     = label_tag :token, class: 'col-form-label' do
       Token
     .col-sm-10
       = f.text_field :token, class: 'form-control', readonly: true
-  .form-group
+  .form-group.row
     = label_tag :ip_address, class: 'col-form-label' do
       IP Address
     .col-sm-10
       = f.text_field :ip_address, class: 'form-control', readonly: true
-  .form-group
+  .form-group.row
     = label_tag :description, class: 'col-form-label' do
       Description
     .col-sm-10
       = f.text_field :description, class: 'form-control'
-  .form-group
+  .form-group.row
     = label_tag :maximum_timeout_human_readable, class: 'col-form-label' do
       Maximum job timeout
     .col-sm-10
       = f.text_field :maximum_timeout_human_readable, class: 'form-control'
       .form-text.text-muted This timeout will take precedence when lower than Project-defined timeout
-  .form-group
+  .form-group.row
     = label_tag :tag_list, class: 'col-form-label' do
       Tags
     .col-sm-10
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 684b082efbb..aa30ebdc3b8 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -9,7 +9,7 @@
     - if @service.respond_to?(:detailed_description)
       %p= @service.detailed_description
   .col-lg-9
-    = form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put, html: { class: 'gl-show-field-errors form-horizontal integration-settings-form js-integration-settings-form', data: { 'can-test' => @service.can_test?, 'test-url' => test_project_service_path(@project, @service) } }) do |form|
+    = form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'can-test' => @service.can_test?, 'test-url' => test_project_service_path(@project, @service) } }) do |form|
       = render 'shared/service_settings', form: form, subject: @service
       - if @service.editable?
         .footer-block.row-content-block
diff --git a/app/views/projects/tags/new.html.haml b/app/views/projects/tags/new.html.haml
index 47fc945f7ee..ea76e6f276f 100644
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -10,12 +10,12 @@
   = s_('TagsPage|New Tag')
 %hr
 
-= form_tag namespace_project_tags_path, method: :post, id: "new-tag-form", class: "form-horizontal common-note-form tag-form js-quick-submit js-requires-input" do
-  .form-group
+= form_tag namespace_project_tags_path, method: :post, id: "new-tag-form", class: "common-note-form tag-form js-quick-submit js-requires-input" do
+  .form-group.row
     = label_tag :tag_name, nil, class: 'col-form-label'
     .col-sm-10
       = text_field_tag :tag_name, params[:tag_name], required: true, autofocus: true, class: 'form-control'
-  .form-group
+  .form-group.row
     = label_tag :ref, 'Create from', class: 'col-form-label'
     .col-sm-10.create-from
       .dropdown
@@ -25,14 +25,14 @@
         = render 'shared/ref_dropdown', dropdown_class: 'wide'
       .form-text.text-muted
         = s_('TagsPage|Existing branch name, tag, or commit SHA')
-  .form-group
+  .form-group.row
     = label_tag :message, nil, class: 'col-form-label'
     .col-sm-10
       = text_area_tag :message, @message, required: false, class: 'form-control', rows: 5
       .form-text.text-muted
         = s_('TagsPage|Optionally, add a message to the tag.')
   %hr
-  .form-group
+  .form-group.row
     = label_tag :release_description, s_('TagsPage|Release notes'), class: 'col-form-label'
     .col-sm-10
       = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project), referenced_users: true } do
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index f17e14e8b07..bcceb69954a 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -1,13 +1,13 @@
 - commit_message = @page.persisted? ? s_("WikiPageEdit|Update %{page_title}") : s_("WikiPageCreate|Create %{page_title}")
 - commit_message = commit_message % { page_title: @page.title }
 
-= form_for [@project.namespace.becomes(Namespace), @project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal wiki-form common-note-form prepend-top-default js-quick-submit' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @page], method: @page.persisted? ? :put : :post, html: { class: 'wiki-form common-note-form prepend-top-default js-quick-submit' } do |f|
   = form_errors(@page)
 
   - if @page.persisted?
     = f.hidden_field :last_commit_sha, value: @page.last_commit_sha
 
-  .form-group
+  .form-group.row
     .col-sm-12= f.label :title, class: 'control-label-full-width'
     .col-sm-12
       = f.text_field :title, class: 'form-control', value: @page.title
@@ -16,12 +16,12 @@
           = icon('lightbulb-o')
           = s_("WikiEditPageTip|Tip: You can move this page by adding the path to the beginning of the title.")
           = link_to icon('question-circle'), help_page_path('user/project/wiki/index', anchor: 'moving-a-wiki-page'), target: '_blank'
-  .form-group
+  .form-group.row
     .col-sm-12= f.label :format, class: 'control-label-full-width'
     .col-sm-12
       = f.select :format, options_for_select(ProjectWiki::MARKUPS, {selected: @page.format}), {}, class: 'form-control'
 
-  .form-group
+  .form-group.row
     .col-sm-12= f.label :content, class: 'control-label-full-width'
     .col-sm-12
       = render layout: 'projects/md_preview', locals: { url: project_wiki_preview_markdown_path(@project, @page.slug) } do
@@ -39,7 +39,7 @@
           - markdown_link = link_to s_("WikiMarkdownDocs|documentation"), help_page_path('user/markdown', anchor: 'wiki-specific-markdown')
           = (s_("WikiMarkdownDocs|More examples are in the %{docs_link}") % { docs_link: markdown_link }).html_safe
 
-  .form-group
+  .form-group.row
     .col-sm-12= f.label :commit_message, class: 'control-label-full-width'
     .col-sm-12= f.text_field :message, class: 'form-control', rows: 18, value: commit_message
 
diff --git a/app/views/shared/_commit_message_container.html.haml b/app/views/shared/_commit_message_container.html.haml
index a22a329dbe9..d6771993c32 100644
--- a/app/views/shared/_commit_message_container.html.haml
+++ b/app/views/shared/_commit_message_container.html.haml
@@ -1,4 +1,4 @@
-.form-group.commit_message-group
+.form-group.row.commit_message-group
   - nonce = SecureRandom.hex
   - descriptions = local_assigns.slice(:message_with_description, :message_without_description)
   = label_tag "commit_message-#{nonce}", class: 'col-form-label' do
diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml
index 3806ead6c87..b297374c6c4 100644
--- a/app/views/shared/_import_form.html.haml
+++ b/app/views/shared/_import_form.html.haml
@@ -1,6 +1,6 @@
 - ci_cd_only = local_assigns.fetch(:ci_cd_only, false)
 
-.form-group.import-url-data
+.form-group.row.import-url-data
   = f.label :import_url, class: 'label-light' do
     %span
       = _('Git repository URL')
diff --git a/app/views/shared/_new_commit_form.html.haml b/app/views/shared/_new_commit_form.html.haml
index ab954d5857c..5f7077daaec 100644
--- a/app/views/shared/_new_commit_form.html.haml
+++ b/app/views/shared/_new_commit_form.html.haml
@@ -7,7 +7,7 @@
   = hidden_field_tag 'branch_name', @ref
 - else
   - if can?(current_user, :push_code, @project)
-    .form-group.branch
+    .form-group.row.branch
       = label_tag 'branch_name', _('Target Branch'), class: 'col-form-label'
       .col-sm-10
         = text_field_tag 'branch_name', branch_name, required: true, class: "form-control js-branch-name ref-name"
diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml
index 07b1eabaf05..41534e48101 100644
--- a/app/views/shared/_service_settings.html.haml
+++ b/app/views/shared/_service_settings.html.haml
@@ -8,13 +8,13 @@
 
 .service-settings
   - if @service.show_active_box?
-    .form-group
+    .form-group.row
       = form.label :active, "Active", class: "col-form-label"
       .col-sm-10
         = form.check_box :active, disabled: disable_fields_service?(@service)
 
   - if @service.configurable_events.present?
-    .form-group
+    .form-group.row
       = form.label :url, "Trigger", class: 'col-form-label'
 
       .col-sm-10
diff --git a/app/views/shared/_visibility_level.html.haml b/app/views/shared/_visibility_level.html.haml
index eb132faa169..ca3641c3cb9 100644
--- a/app/views/shared/_visibility_level.html.haml
+++ b/app/views/shared/_visibility_level.html.haml
@@ -1,6 +1,6 @@
 - with_label = local_assigns.fetch(:with_label, true)
 
-.form-group.visibility-level-setting
+.form-group.row.visibility-level-setting
   - if with_label
     = f.label :visibility_level, class: 'col-form-label' do
       Visibility Level
diff --git a/app/views/shared/form_elements/_description.html.haml b/app/views/shared/form_elements/_description.html.haml
index d42b23843f5..11c2f83152c 100644
--- a/app/views/shared/form_elements/_description.html.haml
+++ b/app/views/shared/form_elements/_description.html.haml
@@ -9,7 +9,7 @@
 - else
   - preview_url = preview_markdown_path(project)
 
-.form-group.detail-page-description
+.form-group.row.detail-page-description
   = form.label :description, 'Description', class: 'col-form-label'
   .col-sm-10
 
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index e62fde003ce..3459e735bd9 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -11,7 +11,7 @@
     = link_to "the #{issuable.class.model_name.human.downcase}", polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), target: "_blank", rel: 'noopener noreferrer'
     and make sure your changes will not unintentionally remove theirs
 
-.form-group
+.form-group.row
   = form.label :title, class: 'col-form-label'
 
   = render 'shared/issuable/form/template_selector', issuable: issuable
@@ -20,7 +20,7 @@
 = render 'shared/form_elements/description', model: issuable, form: form, project: project
 
 - if issuable.respond_to?(:confidential)
-  .form-group
+  .form-group.row
     .col-sm-offset-2.col-sm-10
       .form-check
         = form.label :confidential do
@@ -36,7 +36,7 @@
 = render 'shared/issuable/form/contribution', issuable: issuable, form: form
 
 - if @merge_request_to_resolve_discussions_of
-  .form-group
+  .form-group.row
     .col-sm-10.col-sm-offset-2
       = icon('info-circle')
       - if @merge_request_to_resolve_discussions_of.discussions_can_be_resolved_by?(current_user)
diff --git a/app/views/shared/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml
index 78b39a7633c..387382fbd2c 100644
--- a/app/views/shared/labels/_form.html.haml
+++ b/app/views/shared/labels/_form.html.haml
@@ -1,15 +1,15 @@
-= form_for @label, as: :label, url: url, html: { class: 'form-horizontal label-form js-quick-submit js-requires-input' } do |f|
+= form_for @label, as: :label, url: url, html: { class: 'label-form js-quick-submit 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, autofocus: 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
diff --git a/app/views/shared/members/_group.html.haml b/app/views/shared/members/_group.html.haml
index 769312bd84c..4466f9fcd06 100644
--- a/app/views/shared/members/_group.html.haml
+++ b/app/views/shared/members/_group.html.haml
@@ -14,7 +14,7 @@
         %span{ class: ('text-warning' if group_link.expires_soon?) }
           Expires in #{distance_of_time_in_words_to_now(group_link.expires_at)}
   .controls.member-controls
-    = form_tag project_group_link_path(@project, group_link), method: :put, remote: true, class: 'form-horizontal js-edit-member-form' do
+    = form_tag project_group_link_path(@project, group_link), method: :put, remote: true, class: 'js-edit-member-form' do
       = hidden_field_tag "group_link[group_access]", group_link.group_access
       .member-form-control.dropdown.append-right-5
         %button.dropdown-menu-toggle.js-member-permissions-dropdown{ type: "button",
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml
index 4ca7631a64f..dde3d380083 100644
--- a/app/views/shared/members/_member.html.haml
+++ b/app/views/shared/members/_member.html.haml
@@ -57,7 +57,7 @@
                     title: 'Resend invite'
 
         - if user != current_user && member.can_update?
-          = form_for member, remote: true, html: { class: 'form-horizontal js-edit-member-form' } do |f|
+          = form_for member, remote: true, html: { class: 'js-edit-member-form' } do |f|
             = f.hidden_field :access_level
             .member-form-control.dropdown.append-right-5
               %button.dropdown-menu-toggle.js-member-permissions-dropdown{ type: "button",
diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml
index 9c2c251e779..81de693c79d 100644
--- a/app/views/shared/snippets/_form.html.haml
+++ b/app/views/shared/snippets/_form.html.haml
@@ -2,10 +2,10 @@
   = page_specific_javascript_tag('lib/ace.js')
 
 .snippet-form-holder
-  = form_for @snippet, url: url, html: { class: "form-horizontal snippet-form js-requires-input js-quick-submit common-note-form" } do |f|
+  = form_for @snippet, url: url, html: { class: "snippet-form js-requires-input js-quick-submit common-note-form" } do |f|
     = form_errors(@snippet)
 
-    .form-group
+    .form-group.row
       = f.label :title, class: 'col-form-label'
       .col-sm-10
         = f.text_field :title, class: 'form-control', required: true, autofocus: true
@@ -15,7 +15,7 @@
     = render 'shared/visibility_level', f: f, visibility_level: @snippet.visibility_level, can_change_visibility_level: true, form_model: @snippet
 
     .file-editor
-      .form-group
+      .form-group.row
         = f.label :file_name, "File", class: 'col-form-label'
         .col-sm-10
           .file-holder.snippet