Resolve "Use one column form layout on Admin Area Settings page"

29 files changed, 658 insertions, 769 deletions

diff --git a/app/views/admin/application_settings/_abuse.html.haml b/app/views/admin/application_settings/_abuse.html.haml
index 6b9b2a17dd9..91993838fc8 100644
--- a/app/views/admin/application_settings/_abuse.html.haml
+++ b/app/views/admin/application_settings/_abuse.html.haml
@@ -2,11 +2,10 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .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'
-        .form-text.text-muted
-          Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.
+    .form-group
+      = f.label :admin_notification_email, 'Abuse reports notification email', class: 'label-light'
+      = f.text_field :admin_notification_email, class: 'form-control'
+      .form-text.text-muted
+        Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.
 
   = f.submit 'Save changes', class: "btn btn-success"
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 07f9ea0865b..f40939747f4 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -2,38 +2,32 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :gravatar_enabled, class: 'form-check-input'
-          = f.label :gravatar_enabled, class: 'form-check-label' do
-            Gravatar enabled
-    .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.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.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.row
-      = f.label :user_oauth_applications, 'User OAuth applications', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        .form-check
-          = f.check_box :user_oauth_applications, class: 'form-check-input'
-          = f.label :user_oauth_applications, class: 'form-check-label' do
-            Allow users to register any application to use GitLab as an OAuth provider
-    .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
-          = f.check_box :user_default_external, class: 'form-check-input'
-          = f.label :user_default_external, class: 'form-check-label' do
-            Newly registered users will by default be external
+    .form-group
+      .form-check
+        = f.check_box :gravatar_enabled, class: 'form-check-input'
+        = f.label :gravatar_enabled, class: 'form-check-label' do
+          Gravatar enabled
+    .form-group
+      = f.label :default_projects_limit, class: 'label-light'
+      = f.number_field :default_projects_limit, class: 'form-control'
+    .form-group
+      = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'label-light'
+      = f.number_field :max_attachment_size, class: 'form-control'
+    .form-group
+      = f.label :session_expire_delay, 'Session duration (minutes)', class: 'label-light'
+      = 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
+      = f.label :user_oauth_applications, 'User OAuth applications', class: 'label-light'
+      .form-check
+        = f.check_box :user_oauth_applications, class: 'form-check-input'
+        = f.label :user_oauth_applications, class: 'form-check-label' do
+          Allow users to register any application to use GitLab as an OAuth provider
+    .form-group
+      = f.label :user_default_external, 'New users set to external', class: 'label-light'
+      .form-check
+        = f.check_box :user_default_external, class: 'form-check-input'
+        = f.label :user_default_external, class: 'form-check-label' do
+          Newly registered users will by default be external
 
   = f.submit 'Save changes', class: 'btn btn-success'
diff --git a/app/views/admin/application_settings/_background_jobs.html.haml b/app/views/admin/application_settings/_background_jobs.html.haml
index fc5df02242a..fd8e695ed49 100644
--- a/app/views/admin/application_settings/_background_jobs.html.haml
+++ b/app/views/admin/application_settings/_background_jobs.html.haml
@@ -6,25 +6,22 @@
       These settings require a
       = link_to 'restart', help_page_path('administration/restart_gitlab')
       to take effect.
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :sidekiq_throttling_enabled, class: 'form-check-input'
-          = f.label :sidekiq_throttling_enabled, class: 'form-check-label' do
-            Enable Sidekiq Job Throttling
-          .form-text.text-muted
-            Limit the amount of resources slow running jobs are assigned.
-    .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-group
+      .form-check
+        = f.check_box :sidekiq_throttling_enabled, class: 'form-check-input'
+        = f.label :sidekiq_throttling_enabled, class: 'form-check-label' do
+          Enable Sidekiq Job Throttling
         .form-text.text-muted
-          Choose which queues you wish to throttle.
-    .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'
-        .form-text.text-muted
-          The factor by which the queues should be throttled. A value between 0.0 and 1.0, exclusive.
+          Limit the amount of resources slow running jobs are assigned.
+    .form-group
+      = f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'label-light'
+      = 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
+      = f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'label-light'
+      = f.number_field :sidekiq_throttling_factor, class: 'form-control', min: '0.01', max: '0.99', step: '0.01'
+      .form-text.text-muted
+        The factor by which the queues should be throttled. A value between 0.0 and 1.0, exclusive.
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml
index 233821818e6..7c16cafe13f 100644
--- a/app/views/admin/application_settings/_ci_cd.html.haml
+++ b/app/views/admin/application_settings/_ci_cd.html.haml
@@ -2,46 +2,40 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :auto_devops_enabled, class: 'form-check-input'
-          = f.label :auto_devops_enabled, class: 'form-check-label' do
-            Enabled Auto DevOps for projects by default
-        .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.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.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :shared_runners_enabled, class: 'form-check-input'
-          = f.label :shared_runners_enabled, class: 'form-check-label' do
-            Enable shared runners for new projects
-    .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.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.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'
-        .form-text.text-muted
-          Set the default expiration time for each job's artifacts.
-          0 for unlimited.
-          = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration')
+    .form-group
+      .form-check
+        = f.check_box :auto_devops_enabled, class: 'form-check-input'
+        = f.label :auto_devops_enabled, class: 'form-check-label' do
+          Enabled Auto DevOps for projects by default
+      .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
+      = f.label :auto_devops_domain, class: 'label-light'
+      = 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-check
+        = f.check_box :shared_runners_enabled, class: 'form-check-input'
+        = f.label :shared_runners_enabled, class: 'form-check-label' do
+          Enable shared runners for new projects
+    .form-group
+      = f.label :shared_runners_text, class: 'label-light'
+      = f.text_area :shared_runners_text, class: 'form-control', rows: 4
+      .form-text.text-muted Markdown enabled
+    .form-group
+      = f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'label-light'
+      = 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
+      = f.label :default_artifacts_expire_in, 'Default artifacts expiration', class: 'label-light'
+      = f.text_field :default_artifacts_expire_in, class: 'form-control'
+      .form-text.text-muted
+        Set the default expiration time for each job's artifacts.
+        0 for unlimited.
+        = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration')
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml
index 01be5878a60..99e44ffa741 100644
--- a/app/views/admin/application_settings/_email.html.haml
+++ b/app/views/admin/application_settings/_email.html.haml
@@ -2,25 +2,23 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :email_author_in_body, class: 'form-check-input'
-          = f.label :email_author_in_body, class: 'form-check-label' do
-            Include author name in notification email body
-          .form-text.text-muted
-            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.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :html_emails_enabled, class: 'form-check-input'
-          = f.label :html_emails_enabled, class: 'form-check-label' do
-            Enable HTML emails
-          .form-text.text-muted
-            By default GitLab sends emails in HTML and plain text formats so mail
-            clients can choose what format to use. Disable this option if you only
-            want to send emails in plain text format.
+    .form-group
+      .form-check
+        = f.check_box :email_author_in_body, class: 'form-check-input'
+        = f.label :email_author_in_body, class: 'form-check-label' do
+          Include author name in notification email body
+        .form-text.text-muted
+          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-check
+        = f.check_box :html_emails_enabled, class: 'form-check-input'
+        = f.label :html_emails_enabled, class: 'form-check-label' do
+          Enable HTML emails
+        .form-text.text-muted
+          By default GitLab sends emails in HTML and plain text formats so mail
+          clients can choose what format to use. Disable this option if you only
+          want to send emails in plain text format.
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_gitaly.html.haml b/app/views/admin/application_settings/_gitaly.html.haml
index 859a1c6f45c..0b4001c0824 100644
--- a/app/views/admin/application_settings/_gitaly.html.haml
+++ b/app/views/admin/application_settings/_gitaly.html.haml
@@ -2,26 +2,23 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .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.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'
-        .form-text.text-muted
-          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.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'
-        .form-text.text-muted
-          Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout.
+    .form-group
+      = f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'label-light'
+      = 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
+      = f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'label-light'
+      = f.number_field :gitaly_timeout_fast, class: 'form-control'
+      .form-text.text-muted
+        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
+      = f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'label-light'
+      = f.number_field :gitaly_timeout_medium, class: 'form-control'
+      .form-text.text-muted
+        Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout.
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_help_page.html.haml b/app/views/admin/application_settings/_help_page.html.haml
index 1f6c52d8b1a..1f402fcb786 100644
--- a/app/views/admin/application_settings/_help_page.html.haml
+++ b/app/views/admin/application_settings/_help_page.html.haml
@@ -2,21 +2,18 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .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.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :help_page_hide_commercial_content, class: 'form-check-input'
-          = f.label :help_page_hide_commercial_content, class: 'form-check-label' do
-            Hide marketing-related entries from help
-    .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'
-        %span.form-text.text-muted#support_help_block Alternate support URL for help page
+    .form-group
+      = f.label :help_page_text, class: 'label-light'
+      = f.text_area :help_page_text, class: 'form-control', rows: 4
+      .form-text.text-muted Markdown enabled
+    .form-group
+      .form-check
+        = f.check_box :help_page_hide_commercial_content, class: 'form-check-input'
+        = f.label :help_page_hide_commercial_content, class: 'form-check-label' do
+          Hide marketing-related entries from help
+    .form-group
+      = f.label :help_page_support_url, 'Support page URL', class: 'label-light'
+      = f.text_field :help_page_support_url, class: 'form-control', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block'
+      %span.form-text.text-muted#support_help_block Alternate support URL for help page
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_influx.html.haml b/app/views/admin/application_settings/_influx.html.haml
index b40a714ed8f..61e8e3199a9 100644
--- a/app/views/admin/application_settings/_influx.html.haml
+++ b/app/views/admin/application_settings/_influx.html.haml
@@ -8,61 +8,53 @@
       = 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.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :metrics_enabled, class: 'form-check-input'
-          = f.label :metrics_enabled, class: 'form-check-label' do
-            Enable InfluxDB Metrics
-    .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.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'
-        .form-text.text-muted
-          The UDP port to use for connecting to InfluxDB. InfluxDB requires that
-          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.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'
-        .form-text.text-muted
-          The amount of InfluxDB connections to open. Connections are opened
-          lazily. Users using multi-threaded application servers should ensure
-          enough connections are available (at minimum the amount of application
-          server threads).
-    .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.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.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.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'
-        .form-text.text-muted
-          The amount of points to store in a single UDP packet. More points
-          results in fewer but larger UDP packets being sent.
+    .form-group
+      .form-check
+        = f.check_box :metrics_enabled, class: 'form-check-input'
+        = f.label :metrics_enabled, class: 'form-check-label' do
+          Enable InfluxDB Metrics
+    .form-group
+      = f.label :metrics_host, 'InfluxDB host', class: 'label-light'
+      = f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com'
+    .form-group
+      = f.label :metrics_port, 'InfluxDB port', class: 'label-light'
+      = f.text_field :metrics_port, class: 'form-control', placeholder: '8089'
+      .form-text.text-muted
+        The UDP port to use for connecting to InfluxDB. InfluxDB requires that
+        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
+      = f.label :metrics_pool_size, 'Connection pool size', class: 'label-light'
+      = f.number_field :metrics_pool_size, class: 'form-control'
+      .form-text.text-muted
+        The amount of InfluxDB connections to open. Connections are opened
+        lazily. Users using multi-threaded application servers should ensure
+        enough connections are available (at minimum the amount of application
+        server threads).
+    .form-group
+      = f.label :metrics_timeout, 'Connection timeout', class: 'label-light'
+      = 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
+      = f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'label-light'
+      = 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
+      = f.label :metrics_sample_interval, 'Sampler Interval (sec)', class: 'label-light'
+      = 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
+      = f.label :metrics_packet_size, 'Metrics per packet', class: 'label-light'
+      = f.number_field :metrics_packet_size, class: 'form-control'
+      .form-text.text-muted
+        The amount of points to store in a single UDP packet. More points
+        results in fewer but larger UDP packets being sent.
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_ip_limits.html.haml b/app/views/admin/application_settings/_ip_limits.html.haml
index 320dd52ffc2..73d570a5fee 100644
--- a/app/views/admin/application_settings/_ip_limits.html.haml
+++ b/app/views/admin/application_settings/_ip_limits.html.haml
@@ -2,53 +2,44 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :throttle_unauthenticated_enabled, class: 'form-check-input'
-          = f.label :throttle_unauthenticated_enabled, class: 'form-check-label' do
-            Enable unauthenticated request rate limit
-          %span.form-text.text-muted
-            Helps reduce request volume (e.g. from crawlers or abusive bots)
-    .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.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.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :throttle_authenticated_api_enabled, class: 'form-check-input'
-          = f.label :throttle_authenticated_api_enabled, class: 'form-check-label' do
-            Enable authenticated API request rate limit
-          %span.form-text.text-muted
-            Helps reduce request volume (e.g. from crawlers or abusive bots)
-    .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.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.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :throttle_authenticated_web_enabled, class: 'form-check-input'
-          = f.label :throttle_authenticated_web_enabled, class: 'form-check-label' do
-            Enable authenticated web request rate limit
-          %span.form-text.text-muted
-            Helps reduce request volume (e.g. from crawlers or abusive bots)
-    .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.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'
+    .form-group
+      .form-check
+        = f.check_box :throttle_unauthenticated_enabled, class: 'form-check-input'
+        = f.label :throttle_unauthenticated_enabled, class: 'form-check-label' do
+          Enable unauthenticated request rate limit
+        %span.form-text.text-muted
+          Helps reduce request volume (e.g. from crawlers or abusive bots)
+    .form-group
+      = f.label :throttle_unauthenticated_requests_per_period, 'Max requests per period per IP', class: 'label-light'
+      = f.number_field :throttle_unauthenticated_requests_per_period, class: 'form-control'
+    .form-group
+      = f.label :throttle_unauthenticated_period_in_seconds, 'Rate limit period in seconds', class: 'label-light'
+      = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control'
+    .form-group
+      .form-check
+        = f.check_box :throttle_authenticated_api_enabled, class: 'form-check-input'
+        = f.label :throttle_authenticated_api_enabled, class: 'form-check-label' do
+          Enable authenticated API request rate limit
+        %span.form-text.text-muted
+          Helps reduce request volume (e.g. from crawlers or abusive bots)
+    .form-group
+      = f.label :throttle_authenticated_api_requests_per_period, 'Max requests per period per user', class: 'label-light'
+      = f.number_field :throttle_authenticated_api_requests_per_period, class: 'form-control'
+    .form-group
+      = f.label :throttle_authenticated_api_period_in_seconds, 'Rate limit period in seconds', class: 'label-light'
+      = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control'
+    .form-group
+      .form-check
+        = f.check_box :throttle_authenticated_web_enabled, class: 'form-check-input'
+        = f.label :throttle_authenticated_web_enabled, class: 'form-check-label' do
+          Enable authenticated web request rate limit
+        %span.form-text.text-muted
+          Helps reduce request volume (e.g. from crawlers or abusive bots)
+    .form-group
+      = f.label :throttle_authenticated_web_requests_per_period, 'Max requests per period per user', class: 'label-light'
+      = f.number_field :throttle_authenticated_web_requests_per_period, class: 'form-control'
+    .form-group
+      = f.label :throttle_authenticated_web_period_in_seconds, 'Rate limit period in seconds', class: 'label-light'
+      = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control'
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_koding.html.haml b/app/views/admin/application_settings/_koding.html.haml
index 341c7641fcc..ae60f68f5fe 100644
--- a/app/views/admin/application_settings/_koding.html.haml
+++ b/app/views/admin/application_settings/_koding.html.haml
@@ -2,23 +2,21 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :koding_enabled, class: 'form-check-input'
-          = f.label :koding_enabled, class: 'form-check-label' do
-            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.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'
-        .form-text.text-muted
-          Koding has integration enabled out of the box for the
-          %strong gitlab
-          team, and you need to provide that team's URL here. Learn more in the
-          = succeed "." do
-            = link_to "Koding administration documentation", help_page_path("administration/integration/koding")
+    .form-group
+      .form-check
+        = f.check_box :koding_enabled, class: 'form-check-input'
+        = f.label :koding_enabled, class: 'form-check-label' do
+          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
+      = f.label :koding_url, 'Koding URL', class: 'label-light'
+      = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090'
+      .form-text.text-muted
+        Koding has integration enabled out of the box for the
+        %strong gitlab
+        team, and you need to provide that team's URL here. Learn more in the
+        = succeed "." do
+          = link_to "Koding administration documentation", help_page_path("administration/integration/koding")
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_logging.html.haml b/app/views/admin/application_settings/_logging.html.haml
index f5c1e126c70..a6e549cd1f0 100644
--- a/app/views/admin/application_settings/_logging.html.haml
+++ b/app/views/admin/application_settings/_logging.html.haml
@@ -2,35 +2,31 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :sentry_enabled, class: 'form-check-input'
-          = f.label :sentry_enabled, class: 'form-check-label' do
-            Enable Sentry
-          .form-text.text-muted
-            %p This setting requires a restart to take effect.
-            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-check
+        = f.check_box :sentry_enabled, class: 'form-check-input'
+        = f.label :sentry_enabled, class: 'form-check-label' do
+          Enable Sentry
+        .form-text.text-muted
+          %p This setting requires a restart to take effect.
+          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.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
+      = f.label :sentry_dsn, 'Sentry DSN', class: 'label-light'
+      = f.text_field :sentry_dsn, class: 'form-control'
 
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :clientside_sentry_enabled, class: 'form-check-input'
-          = f.label :clientside_sentry_enabled, class: 'form-check-label' do
-            Enable Clientside Sentry
-          .form-text.text-muted
-            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-check
+        = f.check_box :clientside_sentry_enabled, class: 'form-check-input'
+        = f.label :clientside_sentry_enabled, class: 'form-check-label' do
+          Enable Clientside Sentry
+        .form-text.text-muted
+          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.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'
+    .form-group
+      = f.label :clientside_sentry_dsn, 'Clientside Sentry DSN', class: 'label-light'
+      = f.text_field :clientside_sentry_dsn, class: 'form-control'
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml
index 5dadb7b814b..e046242bee0 100644
--- a/app/views/admin/application_settings/_outbound.html.haml
+++ b/app/views/admin/application_settings/_outbound.html.haml
@@ -2,11 +2,10 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :allow_local_requests_from_hooks_and_services, class: 'form-check-input'
-          = f.label :allow_local_requests_from_hooks_and_services, class: 'form-check-label' do
-            Allow requests to the local network from hooks and services
+    .form-group
+      .form-check
+        = f.check_box :allow_local_requests_from_hooks_and_services, class: 'form-check-input'
+        = f.label :allow_local_requests_from_hooks_and_services, class: 'form-check-label' do
+          Allow requests to the local network from hooks and services
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml
index f1889c3105f..f168ec62ffd 100644
--- a/app/views/admin/application_settings/_pages.html.haml
+++ b/app/views/admin/application_settings/_pages.html.haml
@@ -2,21 +2,19 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .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.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :pages_domain_verification_enabled, class: 'form-check-input'
-          = f.label :pages_domain_verification_enabled, class: 'form-check-label' do
-            Require users to prove ownership of custom domains
-        .form-text.text-muted
-          Domain verification is an essential security measure for public GitLab
-          sites. Users are required to demonstrate they control a domain before
-          it is enabled
-          = link_to icon('question-circle'), help_page_path('user/project/pages/getting_started_part_three.md', anchor: 'dns-txt-record')
+    .form-group
+      = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'label-light'
+      = f.number_field :max_pages_size, class: 'form-control'
+      .form-text.text-muted 0 for unlimited
+    .form-group
+      .form-check
+        = f.check_box :pages_domain_verification_enabled, class: 'form-check-input'
+        = f.label :pages_domain_verification_enabled, class: 'form-check-label' do
+          Require users to prove ownership of custom domains
+      .form-text.text-muted
+        Domain verification is an essential security measure for public GitLab
+        sites. Users are required to demonstrate they control a domain before
+        it is enabled
+        = link_to icon('question-circle'), help_page_path('user/project/pages/getting_started_part_three.md', anchor: 'dns-txt-record')
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_performance.html.haml b/app/views/admin/application_settings/_performance.html.haml
index 57c22ce563f..ffa25af77ed 100644
--- a/app/views/admin/application_settings/_performance.html.haml
+++ b/app/views/admin/application_settings/_performance.html.haml
@@ -2,18 +2,17 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :authorized_keys_enabled, class: 'form-check-input'
-          = f.label :authorized_keys_enabled, class: 'form-check-label' do
-            Write to "authorized_keys" file
-          .form-text.text-muted
-            By default, we write to the "authorized_keys" file to support Git
-            over SSH without additional configuration. GitLab can be optimized
-            to authenticate SSH keys via the database file. Only uncheck this
-            if you have configured your OpenSSH server to use the
-            AuthorizedKeysCommand. Click on the help icon for more details.
-            = link_to icon('question-circle'), help_page_path('administration/operations/fast_ssh_key_lookup')
+    .form-group
+      .form-check
+        = f.check_box :authorized_keys_enabled, class: 'form-check-input'
+        = f.label :authorized_keys_enabled, class: 'form-check-label' do
+          Write to "authorized_keys" file
+        .form-text.text-muted
+          By default, we write to the "authorized_keys" file to support Git
+          over SSH without additional configuration. GitLab can be optimized
+          to authenticate SSH keys via the database file. Only uncheck this
+          if you have configured your OpenSSH server to use the
+          AuthorizedKeysCommand. Click on the help icon for more details.
+          = link_to icon('question-circle'), help_page_path('administration/operations/fast_ssh_key_lookup')
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_performance_bar.html.haml b/app/views/admin/application_settings/_performance_bar.html.haml
index ed4de2234f7..ddbfcc6b77b 100644
--- a/app/views/admin/application_settings/_performance_bar.html.haml
+++ b/app/views/admin/application_settings/_performance_bar.html.haml
@@ -2,15 +2,13 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :performance_bar_enabled, class: 'form-check-input'
-          = f.label :performance_bar_enabled, class: 'form-check-label' do
-            Enable the Performance Bar
-    .form-group.row
-      = f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = f.text_field :performance_bar_allowed_group_path, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path
+    .form-group
+      .form-check
+        = f.check_box :performance_bar_enabled, class: 'form-check-input'
+        = f.label :performance_bar_enabled, class: 'form-check-label' do
+          Enable the Performance Bar
+    .form-group
+      = f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'label-light'
+      = f.text_field :performance_bar_allowed_group_path, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_plantuml.html.haml b/app/views/admin/application_settings/_plantuml.html.haml
index e0dc058762e..259f18b3b96 100644
--- a/app/views/admin/application_settings/_plantuml.html.haml
+++ b/app/views/admin/application_settings/_plantuml.html.haml
@@ -2,19 +2,17 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :plantuml_enabled, class: 'form-check-input'
-          = f.label :plantuml_enabled, class: 'form-check-label' do
-            Enable PlantUML
-    .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'
-        .form-text.text-muted
-          Allow rendering of
-          = link_to "PlantUML", "http://plantuml.com"
-          diagrams in Asciidoc documents using an external PlantUML service.
+    .form-group
+      .form-check
+        = f.check_box :plantuml_enabled, class: 'form-check-input'
+        = f.label :plantuml_enabled, class: 'form-check-label' do
+          Enable PlantUML
+    .form-group
+      = f.label :plantuml_url, 'PlantUML URL', class: 'label-light'
+      = f.text_field :plantuml_url, class: 'form-control', placeholder: 'http://gitlab.your-plantuml-instance.com:8080'
+      .form-text.text-muted
+        Allow rendering of
+        = link_to "PlantUML", "http://plantuml.com"
+        diagrams in Asciidoc documents using an external PlantUML service.
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_prometheus.html.haml b/app/views/admin/application_settings/_prometheus.html.haml
index d3c3656e96a..ad92b18b2c9 100644
--- a/app/views/admin/application_settings/_prometheus.html.haml
+++ b/app/views/admin/application_settings/_prometheus.html.haml
@@ -11,18 +11,17 @@
       = 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.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :prometheus_metrics_enabled, class: 'form-check-input'
-          = f.label :prometheus_metrics_enabled, class: 'form-check-label' do
-            Enable Prometheus Metrics
-          - unless Gitlab::Metrics.metrics_folder_present?
-            .form-text.text-muted
-              %strong.cred WARNING:
-              Environment variable
-              %code prometheus_multiproc_dir
-              does not exist or is not pointing to a valid directory.
-              = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory')
+    .form-group
+      .form-check
+        = f.check_box :prometheus_metrics_enabled, class: 'form-check-input'
+        = f.label :prometheus_metrics_enabled, class: 'form-check-label' do
+          Enable Prometheus Metrics
+        - unless Gitlab::Metrics.metrics_folder_present?
+          .form-text.text-muted
+            %strong.cred WARNING:
+            Environment variable
+            %code prometheus_multiproc_dir
+            does not exist or is not pointing to a valid directory.
+            = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory')
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_realtime.html.haml b/app/views/admin/application_settings/_realtime.html.haml
index 63a592cc2fd..120cf4909b2 100644
--- a/app/views/admin/application_settings/_realtime.html.haml
+++ b/app/views/admin/application_settings/_realtime.html.haml
@@ -2,18 +2,17 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .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'
-        .form-text.text-muted
-          Change this value to influence how frequently the GitLab UI polls for updates.
-          If you set the value to 2 all polling intervals are multiplied
-          by 2, which means that polling happens half as frequently.
-          The multiplier can also have a decimal value.
-          The default value (1) is a reasonable choice for the majority of GitLab
-          installations. Set to 0 to completely disable polling.
-          = link_to icon('question-circle'), help_page_path('administration/polling')
+    .form-group
+      = f.label :polling_interval_multiplier, 'Polling interval multiplier', class: 'label-light'
+      = f.text_field :polling_interval_multiplier, class: 'form-control'
+      .form-text.text-muted
+        Change this value to influence how frequently the GitLab UI polls for updates.
+        If you set the value to 2 all polling intervals are multiplied
+        by 2, which means that polling happens half as frequently.
+        The multiplier can also have a decimal value.
+        The default value (1) is a reasonable choice for the majority of GitLab
+        installations. Set to 0 to completely disable polling.
+        = link_to icon('question-circle'), help_page_path('administration/polling')
 
   = f.submit 'Save changes', class: "btn btn-success"
 
diff --git a/app/views/admin/application_settings/_registry.html.haml b/app/views/admin/application_settings/_registry.html.haml
index 8524cbfe4d9..beac70482e5 100644
--- a/app/views/admin/application_settings/_registry.html.haml
+++ b/app/views/admin/application_settings/_registry.html.haml
@@ -2,9 +2,8 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .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'
+    .form-group
+      = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'label-light'
+      = f.number_field :container_registry_token_expire_delay, class: 'form-control'
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml
index 1311f17ecda..57facc380eb 100644
--- a/app/views/admin/application_settings/_repository_check.html.haml
+++ b/app/views/admin/application_settings/_repository_check.html.haml
@@ -4,59 +4,53 @@
   %fieldset
     .sub-section
       %h4 Repository checks
-      .form-group.row
-        .offset-sm-2.col-sm-10
-          .form-check
-            = f.check_box :repository_checks_enabled, class: 'form-check-input'
-            = f.label :repository_checks_enabled, class: 'form-check-label' do
-              Enable Repository Checks
-            .form-text.text-muted
-              GitLab will periodically run
-              %a{ href: 'https://git-scm.com/docs/git-fsck', target: 'blank' } 'git fsck'
-              in all project and wiki repositories to look for silent disk corruption issues.
-      .form-group.row
-        .offset-sm-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-group
+        .form-check
+          = f.check_box :repository_checks_enabled, class: 'form-check-input'
+          = f.label :repository_checks_enabled, class: 'form-check-label' do
+            Enable Repository Checks
           .form-text.text-muted
-            If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.
+            GitLab will periodically run
+            %a{ href: 'https://git-scm.com/docs/git-fsck', target: 'blank' } 'git fsck'
+            in all project and wiki repositories to look for silent disk corruption issues.
+      .form-group
+        = 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
+          If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.
 
     .sub-section
       %h4 Housekeeping
-      .form-group.row
-        .offset-sm-2.col-sm-10
-          .form-check
-            = f.check_box :housekeeping_enabled, class: 'form-check-input'
-            = f.label :housekeeping_enabled, class: 'form-check-label' do
-              Enable automatic repository housekeeping (git repack, git gc)
-            .form-text.text-muted
-              If you keep automatic housekeeping disabled for a long time Git
-              repository access on your GitLab server will become slower and your
-              repositories will use more disk space. We recommend to always leave
-              this enabled.
-          .form-check
-            = f.check_box :housekeeping_bitmaps_enabled, class: 'form-check-input'
-            = f.label :housekeeping_bitmaps_enabled, class: 'form-check-label' do
-              Enable Git pack file bitmap creation
-            .form-text.text-muted
-              Creating pack file bitmaps makes housekeeping take a little longer but
-              bitmaps should accelerate 'git clone' performance.
-      .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-group
+        .form-check
+          = f.check_box :housekeeping_enabled, class: 'form-check-input'
+          = f.label :housekeeping_enabled, class: 'form-check-label' do
+            Enable automatic repository housekeeping (git repack, git gc)
           .form-text.text-muted
-            Number of Git pushes after which an incremental 'git repack' is run.
-      .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'
+            If you keep automatic housekeeping disabled for a long time Git
+            repository access on your GitLab server will become slower and your
+            repositories will use more disk space. We recommend to always leave
+            this enabled.
+        .form-check
+          = f.check_box :housekeeping_bitmaps_enabled, class: 'form-check-input'
+          = f.label :housekeeping_bitmaps_enabled, class: 'form-check-label' do
+            Enable Git pack file bitmap creation
           .form-text.text-muted
-            Number of Git pushes after which a full 'git repack' is run.
-      .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'
-          .form-text.text-muted
-            Number of Git pushes after which 'git gc' is run.
+            Creating pack file bitmaps makes housekeeping take a little longer but
+            bitmaps should accelerate 'git clone' performance.
+      .form-group
+        = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'label-light'
+        = 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
+        = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'label-light'
+        = 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
+        = f.label :housekeeping_gc_period, 'Git GC period', class: 'label-light'
+        = f.number_field :housekeeping_gc_period, class: 'form-control'
+        .form-text.text-muted
+          Number of Git pushes after which 'git gc' is run.
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_repository_mirrors_form.html.haml b/app/views/admin/application_settings/_repository_mirrors_form.html.haml
index 187c6c28bb1..beeb5169361 100644
--- a/app/views/admin/application_settings/_repository_mirrors_form.html.haml
+++ b/app/views/admin/application_settings/_repository_mirrors_form.html.haml
@@ -2,15 +2,14 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      = f.label :mirror_available, 'Enable mirror configuration', class: 'control-label col-sm-4'
-      .col-sm-8
-        .form-check
-          = f.check_box :mirror_available, class: 'form-check-input'
-          = f.label :mirror_available, class: 'form-check-label' do
-            Allow mirrors to be setup for projects
-        %span.form-text.text-muted
-          If disabled, only admins will be able to setup mirrors in projects.
-          = link_to icon('question-circle'), help_page_path('workflow/repository_mirroring')
+    .form-group
+      = f.label :mirror_available, 'Enable mirror configuration', class: 'label-light'
+      .form-check
+        = f.check_box :mirror_available, class: 'form-check-input'
+        = f.label :mirror_available, class: 'form-check-label' do
+          Allow mirrors to be setup for projects
+      %span.form-text.text-muted
+        If disabled, only admins will be able to setup mirrors in projects.
+        = link_to icon('question-circle'), help_page_path('workflow/repository_mirroring')
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_repository_storage.html.haml b/app/views/admin/application_settings/_repository_storage.html.haml
index 89d2c114b22..5a303666353 100644
--- a/app/views/admin/application_settings/_repository_storage.html.haml
+++ b/app/views/admin/application_settings/_repository_storage.html.haml
@@ -3,56 +3,49 @@
 
   %fieldset
     .sub-section
-      .form-group.row
-        .offset-sm-2.col-sm-10
-          .form-check
-            = f.check_box :hashed_storage_enabled, class: 'form-check-input'
-            = f.label :hashed_storage_enabled, class: 'form-check-label' do
-              Create new projects using hashed storage paths
-            .form-text.text-muted
-              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.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),
-            {include_hidden: false}, multiple: true, class: 'form-control'
+      .form-group
+        .form-check
+          = f.check_box :hashed_storage_enabled, class: 'form-check-input'
+          = f.label :hashed_storage_enabled, class: 'form-check-label' do
+            Create new projects using hashed storage paths
           .form-text.text-muted
-            Manage repository storage paths. Learn more in the
-            = succeed "." do
-              = link_to "repository storages documentation", help_page_path("administration/repository_storage_paths")
+            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
+        = f.label :repository_storages, 'Storage paths for new projects', class: 'label-light'
+        = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages),
+          {include_hidden: false}, multiple: true, class: 'form-control'
+        .form-text.text-muted
+          Manage repository storage paths. Learn more in the
+          = succeed "." do
+            = link_to "repository storages documentation", help_page_path("administration/repository_storage_paths")
     .sub-section
       %h4 Circuit breaker
-      .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.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.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.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.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'
-          .form-text.text-muted
-            = circuitbreaker_failure_reset_time_help_text
+      .form-group
+        = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'label-light'
+        = f.number_field :circuitbreaker_check_interval, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_check_interval_help_text
+      .form-group
+        = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'label-light'
+        = f.number_field :circuitbreaker_access_retries, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_access_retries_help_text
+      .form-group
+        = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'label-light'
+        = f.number_field :circuitbreaker_storage_timeout, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_storage_timeout_help_text
+      .form-group
+        = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'label-light'
+        = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_failure_count_help_text
+      .form-group
+        = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'label-light'
+        = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_failure_reset_time_help_text
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml
index 2ba26158162..69d1a43c511 100644
--- a/app/views/admin/application_settings/_signin.html.haml
+++ b/app/views/admin/application_settings/_signin.html.haml
@@ -2,59 +2,51 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :password_authentication_enabled_for_web, class: 'form-check-input'
-          = f.label :password_authentication_enabled_for_web, class: 'form-check-label' do
-            Password authentication enabled for web interface
-            .form-text.text-muted
-              When disabled, an external authentication provider must be used.
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :password_authentication_enabled_for_git, class: 'form-check-input'
-          = f.label :password_authentication_enabled_for_git, class: 'form-check-label' do
-            Password authentication enabled for Git over HTTP(S)
-            .form-text.text-muted
-              When disabled, a Personal Access Token
-              - if Gitlab::Auth::LDAP::Config.enabled?
-                or LDAP password
-              must be used to authenticate.
+    .form-group
+      .form-check
+        = f.check_box :password_authentication_enabled_for_web, class: 'form-check-input'
+        = f.label :password_authentication_enabled_for_web, class: 'form-check-label' do
+          Password authentication enabled for web interface
+          .form-text.text-muted
+            When disabled, an external authentication provider must be used.
+    .form-group
+      .form-check
+        = f.check_box :password_authentication_enabled_for_git, class: 'form-check-input'
+        = f.label :password_authentication_enabled_for_git, class: 'form-check-label' do
+          Password authentication enabled for Git over HTTP(S)
+          .form-text.text-muted
+            When disabled, a Personal Access Token
+            - if Gitlab::Auth::LDAP::Config.enabled?
+              or LDAP password
+            must be used to authenticate.
     - if omniauth_enabled? && button_based_providers.any?
-      .form-group.row
-        = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'col-form-label col-sm-2'
+      .form-group
+        = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'label-light'
         = hidden_field_tag 'application_setting[enabled_oauth_sign_in_sources][]'
-        .col-sm-10
-          .btn-group{ data: { toggle: 'buttons' } }
-            - oauth_providers_checkboxes.each do |source|
-              = source
-    .form-group.row
-      = f.label :two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        .form-check
-          = f.check_box :require_two_factor_authentication, class: 'form-check-input'
-          = f.label :require_two_factor_authentication, class: 'form-check-label' do
-            Require all users to setup Two-factor authentication
-    .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.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.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.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
-        .form-text.text-muted Markdown enabled
+        .btn-group{ data: { toggle: 'buttons' } }
+          - oauth_providers_checkboxes.each do |source|
+            = source
+    .form-group
+      = f.label :two_factor_authentication, 'Two-factor authentication', class: 'label-light'
+      .form-check
+        = f.check_box :require_two_factor_authentication, class: 'form-check-input'
+        = f.label :require_two_factor_authentication, class: 'form-check-label' do
+          Require all users to setup Two-factor authentication
+    .form-group
+      = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'label-light'
+      = 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
+      = f.label :home_page_url, 'Home page URL', class: 'label-light'
+      = 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
+      = f.label :after_sign_out_path, class: 'label-light'
+      = 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
+      = f.label :sign_in_text, class: 'label-light'
+      = f.text_area :sign_in_text, class: 'form-control', rows: 4
+      .form-text.text-muted Markdown enabled
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_signup.html.haml b/app/views/admin/application_settings/_signup.html.haml
index 279f96389e9..b9ba9128cc9 100644
--- a/app/views/admin/application_settings/_signup.html.haml
+++ b/app/views/admin/application_settings/_signup.html.haml
@@ -2,57 +2,49 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :signup_enabled, class: 'form-check-input'
-          = f.label :signup_enabled, class: 'form-check-label' do
-            Sign-up enabled
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :send_user_confirmation_email, class: 'form-check-input'
-          = f.label :send_user_confirmation_email, class: 'form-check-label' do
-            Send confirmation email on sign-up
-    .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.row
-      = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'col-form-label col-sm-2'
-      .col-sm-10
-        .form-check
-          = f.check_box :domain_blacklist_enabled, class: 'form-check-input'
-          = f.label :domain_blacklist_enabled, class: 'form-check-label' do
-            Enable domain blacklist for sign ups
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = radio_button_tag :blacklist_type, :file, class: 'form-check-input'
-          = label_tag :blacklist_type_file, class: 'form-check-label' do
-            .option-title
-              Upload blacklist file
-        .form-check
-          = radio_button_tag :blacklist_type, :raw, @application_setting.domain_blacklist.present? || @application_setting.domain_blacklist.blank?, class: 'form-check-input'
-          = label_tag :blacklist_type_raw, class: 'form-check-label' do
-            .option-title
-              Enter blacklist manually
-    .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.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-check
+        = f.check_box :signup_enabled, class: 'form-check-input'
+        = f.label :signup_enabled, class: 'form-check-label' do
+          Sign-up enabled
+    .form-group
+      .form-check
+        = f.check_box :send_user_confirmation_email, class: 'form-check-input'
+        = f.label :send_user_confirmation_email, class: 'form-check-label' do
+          Send confirmation email on sign-up
+    .form-group
+      = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'label-light'
+      = 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
+      = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'label-light'
+      .form-check
+        = f.check_box :domain_blacklist_enabled, class: 'form-check-input'
+        = f.label :domain_blacklist_enabled, class: 'form-check-label' do
+          Enable domain blacklist for sign ups
+    .form-group
+      .form-check
+        = radio_button_tag :blacklist_type, :file, false, class: 'form-check-input'
+        = label_tag :blacklist_type_file, class: 'form-check-label' do
+          .option-title
+            Upload blacklist file
+      .form-check
+        = radio_button_tag :blacklist_type, :raw, @application_setting.domain_blacklist.present? || @application_setting.domain_blacklist.blank?, class: 'form-check-input'
+        = label_tag :blacklist_type_raw, class: 'form-check-label' do
+          .option-title
+            Enter blacklist manually
+    .form-group.blacklist-file
+      = f.label :domain_blacklist_file, 'Blacklist file', class: 'label-light'
+      = 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
+      = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'label-light'
+      = 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.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
-        .form-text.text-muted Markdown enabled
+    .form-group
+      = f.label :after_sign_up_text, class: 'label-light'
+      = f.text_area :after_sign_up_text, class: 'form-control', rows: 4
+      .form-text.text-muted Markdown enabled
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_spam.html.haml b/app/views/admin/application_settings/_spam.html.haml
index fb38e4ae922..8f0dce962a9 100644
--- a/app/views/admin/application_settings/_spam.html.haml
+++ b/app/views/admin/application_settings/_spam.html.haml
@@ -2,64 +2,56 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :recaptcha_enabled, class: 'form-check-input'
-          = f.label :recaptcha_enabled, class: 'form-check-label' do
-            Enable reCAPTCHA
-          %span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts
-
-    .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'
-        .form-text.text-muted
-          Generate site and private keys at
-          %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha
-
-    .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.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :akismet_enabled, class: 'form-check-input'
-          = f.label :akismet_enabled, class: 'form-check-label' do
-            Enable Akismet
-          %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues
-
-    .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'
-        .form-text.text-muted
-          Generate API key at
-          %a{ href: 'http://www.akismet.com', target: 'blank' } http://www.akismet.com
-
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :unique_ips_limit_enabled, class: 'form-check-input'
-          = f.label :unique_ips_limit_enabled, class: 'form-check-label' do
-            Limit sign in from multiple ips
-          %span.form-text.text-muted#unique_ip_help_block
-            Helps prevent malicious users hide their activity
-
-    .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.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'
-        .form-text.text-muted
-          How many seconds an IP will be counted towards the limit
+    .form-group
+      .form-check
+        = f.check_box :recaptcha_enabled, class: 'form-check-input'
+        = f.label :recaptcha_enabled, class: 'form-check-label' do
+          Enable reCAPTCHA
+        %span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts
+
+    .form-group
+      = f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'label-light'
+      = f.text_field :recaptcha_site_key, class: 'form-control'
+      .form-text.text-muted
+        Generate site and private keys at
+        %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha
+
+    .form-group
+      = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'label-light'
+      = f.text_field :recaptcha_private_key, class: 'form-control'
+
+    .form-group
+      .form-check
+        = f.check_box :akismet_enabled, class: 'form-check-input'
+        = f.label :akismet_enabled, class: 'form-check-label' do
+          Enable Akismet
+        %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues
+
+    .form-group
+      = f.label :akismet_api_key, 'Akismet API Key', class: 'label-light'
+      = f.text_field :akismet_api_key, class: 'form-control'
+      .form-text.text-muted
+        Generate API key at
+        %a{ href: 'http://www.akismet.com', target: 'blank' } http://www.akismet.com
+
+    .form-group
+      .form-check
+        = f.check_box :unique_ips_limit_enabled, class: 'form-check-input'
+        = f.label :unique_ips_limit_enabled, class: 'form-check-label' do
+          Limit sign in from multiple ips
+        %span.form-text.text-muted#unique_ip_help_block
+          Helps prevent malicious users hide their activity
+
+    .form-group
+      = f.label :unique_ips_limit_per_user, 'IPs per user', class: 'label-light'
+      = f.number_field :unique_ips_limit_per_user, class: 'form-control'
+      .form-text.text-muted
+        Maximum number of unique IPs per user
+
+    .form-group
+      = f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'label-light'
+      = f.number_field :unique_ips_limit_time_window, class: 'form-control'
+      .form-text.text-muted
+        How many seconds an IP will be counted towards the limit
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_terminal.html.haml b/app/views/admin/application_settings/_terminal.html.haml
index ae02d07e556..543628ff0ee 100644
--- a/app/views/admin/application_settings/_terminal.html.haml
+++ b/app/views/admin/application_settings/_terminal.html.haml
@@ -2,12 +2,11 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .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'
-        .form-text.text-muted
-          Maximum time for web terminal websocket connection (in seconds).
-          0 for unlimited.
+    .form-group
+      = f.label :terminal_max_session_time, 'Max session time', class: 'label-light'
+      = f.number_field :terminal_max_session_time, class: 'form-control'
+      .form-text.text-muted
+        Maximum time for web terminal websocket connection (in seconds).
+        0 for unlimited.
 
   = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_terms.html.haml b/app/views/admin/application_settings/_terms.html.haml
index 7941c8508e8..d3dc8659d1b 100644
--- a/app/views/admin/application_settings/_terms.html.haml
+++ b/app/views/admin/application_settings/_terms.html.haml
@@ -2,21 +2,18 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .col-sm-12
-        .form-check
-          = f.check_box :enforce_terms, class: 'form-check-input'
-          = f.label :enforce_terms, class: 'form-check-label' do
-            = _("Require all users to accept Terms of Service and Privacy Policy when they access GitLab.")
-          .form-text.text-muted
-            = _("When enabled, users cannot use GitLab until the terms have been accepted.")
-    .form-group.row
-      .col-sm-12
-        = f.label :terms do
-          = _("Terms of Service Agreement and Privacy Policy")
-      .col-sm-12
-        = f.text_area :terms, class: 'form-control', rows: 8
+    .form-group
+      .form-check
+        = f.check_box :enforce_terms, class: 'form-check-input'
+        = f.label :enforce_terms, class: 'form-check-label' do
+          = _("Require all users to accept Terms of Service and Privacy Policy when they access GitLab.")
         .form-text.text-muted
-          = _("Markdown enabled")
+          = _("When enabled, users cannot use GitLab until the terms have been accepted.")
+    .form-group
+      = f.label :terms do
+        = _("Terms of Service Agreement and Privacy Policy")
+      = f.text_area :terms, class: 'form-control', rows: 8
+      .form-text.text-muted
+        = _("Markdown enabled")
 
   = f.submit _("Save changes"), class: "btn btn-success"
diff --git a/app/views/admin/application_settings/_usage.html.haml b/app/views/admin/application_settings/_usage.html.haml
index c110fd4d60d..49a3ee33a85 100644
--- a/app/views/admin/application_settings/_usage.html.haml
+++ b/app/views/admin/application_settings/_usage.html.haml
@@ -2,36 +2,34 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .offset-sm-2.col-sm-10
-        .form-check
-          = f.check_box :version_check_enabled, class: 'form-check-input'
-          = f.label :version_check_enabled, class: 'form-check-label' do
-            Enable version check
-          .form-text.text-muted
-            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.row
-      .offset-sm-2.col-sm-10
-        - can_be_configured = @application_setting.usage_ping_can_be_configured?
-        .form-check
-          = f.check_box :usage_ping_enabled, disabled: !can_be_configured, class: 'form-check-input'
-          = f.label :usage_ping_enabled, class: 'form-check-label' do
-            Enable usage ping
-          .form-text.text-muted
-            - if can_be_configured
-              To help improve GitLab and its user experience, GitLab will
-              periodically collect usage information.
-              = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "usage-ping")
-              about what information is shared with GitLab Inc. Visit
-              = link_to 'Cohorts', admin_cohorts_path(anchor: 'usage-ping')
-              to see the JSON payload sent.
-            - else
-              The usage ping is disabled, and cannot be configured through this
-              form. For more information, see the documentation on
-              = succeed '.' do
-                = link_to 'deactivating the usage ping', help_page_path('user/admin_area/settings/usage_statistics', anchor: 'deactivate-the-usage-ping')
+    .form-group
+      .form-check
+        = f.check_box :version_check_enabled, class: 'form-check-input'
+        = f.label :version_check_enabled, class: 'form-check-label' do
+          Enable version check
+        .form-text.text-muted
+          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
+      - can_be_configured = @application_setting.usage_ping_can_be_configured?
+      .form-check
+        = f.check_box :usage_ping_enabled, disabled: !can_be_configured, class: 'form-check-input'
+        = f.label :usage_ping_enabled, class: 'form-check-label' do
+          Enable usage ping
+        .form-text.text-muted
+          - if can_be_configured
+            To help improve GitLab and its user experience, GitLab will
+            periodically collect usage information.
+            = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "usage-ping")
+            about what information is shared with GitLab Inc. Visit
+            = link_to 'Cohorts', admin_cohorts_path(anchor: 'usage-ping')
+            to see the JSON payload sent.
+          - else
+            The usage ping is disabled, and cannot be configured through this
+            form. For more information, see the documentation on
+            = succeed '.' do
+              = link_to 'deactivating the usage ping', help_page_path('user/admin_area/settings/usage_statistics', anchor: 'deactivate-the-usage-ping')
 
   = f.submit 'Save changes', class: "btn btn-success"
 
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 05520bd8d2d..4cc3e6a7d03 100644
--- a/app/views/admin/application_settings/_visibility_and_access.html.haml
+++ b/app/views/admin/application_settings/_visibility_and_access.html.haml
@@ -2,66 +2,57 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .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.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.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.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.row
-      = f.label :restricted_visibility_levels, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        - checkbox_name = 'application_setting[restricted_visibility_levels][]'
-        = hidden_field_tag(checkbox_name)
-        - restricted_level_checkboxes('restricted-visibility-help', checkbox_name, class: 'form-check-input').each do |level|
-          .form-check
-            = level
-        %span.form-text.text-muted#restricted-visibility-help
-          Selected levels cannot be used by non-admin users for groups, projects or snippets.
-          If the public level is restricted, user profiles are only visible to logged in users.
-    .form-group.row
-      = f.label :import_sources, class: 'col-form-label col-sm-2'
-      .col-sm-10
-        = hidden_field_tag 'application_setting[import_sources][]'
-        - import_sources_checkboxes('import-sources-help', class: 'form-check-input').each do |source|
-          .form-check= source
-        %span.form-text.text-muted#import-sources-help
-          Enabled sources for code import during project creation. OmniAuth must be configured for GitHub
-          = link_to "(?)", help_page_path("integration/github")
-          , Bitbucket
-          = link_to "(?)", help_page_path("integration/bitbucket")
-          and GitLab.com
-          = link_to "(?)", help_page_path("integration/gitlab")
-
-    .form-group.row
-      .offset-sm-2.col-sm-10
+    .form-group
+      = f.label :default_branch_protection, class: 'label-light'
+      = 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
+      = f.label :default_project_visibility, class: 'label-light'
+      = 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
+      = f.label :default_snippet_visibility, class: 'label-light'
+      = 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
+      = f.label :default_group_visibility, class: 'label-light'
+      = render('shared/visibility_radios', model_method: :default_group_visibility, form: f, selected_level: @application_setting.default_group_visibility, form_model: Group.new)
+    .form-group
+      = f.label :restricted_visibility_levels, class: 'label-light'
+      - checkbox_name = 'application_setting[restricted_visibility_levels][]'
+      = hidden_field_tag(checkbox_name)
+      - restricted_level_checkboxes('restricted-visibility-help', checkbox_name, class: 'form-check-input').each do |level|
         .form-check
-          = f.check_box :project_export_enabled, class: 'form-check-input'
-          = f.label :project_export_enabled, class: 'form-check-label' do
-            Project export enabled
+          = level
+      %span.form-text.text-muted#restricted-visibility-help
+        Selected levels cannot be used by non-admin users for groups, projects or snippets.
+        If the public level is restricted, user profiles are only visible to logged in users.
+    .form-group
+      = f.label :import_sources, class: 'label-light'
+      = hidden_field_tag 'application_setting[import_sources][]'
+      - import_sources_checkboxes('import-sources-help', class: 'form-check-input').each do |source|
+        .form-check= source
+      %span.form-text.text-muted#import-sources-help
+        Enabled sources for code import during project creation. OmniAuth must be configured for GitHub
+        = link_to "(?)", help_page_path("integration/github")
+        , Bitbucket
+        = link_to "(?)", help_page_path("integration/bitbucket")
+        and GitLab.com
+        = link_to "(?)", help_page_path("integration/gitlab")
+
+    .form-group
+      .form-check
+        = f.check_box :project_export_enabled, class: 'form-check-input'
+        = f.label :project_export_enabled, class: 'form-check-label' do
+          Project export enabled
 
-    .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')
-        %span.form-text.text-muted#clone-protocol-help
-          Allow only the selected protocols to be used for Git access.
+    .form-group
+      %label.label-light Enabled Git access protocols
+      = select(:application_setting, :enabled_git_access_protocol, [['Both SSH and HTTP(S)', nil], ['Only SSH', 'ssh'], ['Only HTTP(S)', 'http']], {}, class: 'form-control')
+      %span.form-text.text-muted#clone-protocol-help
+        Allow only the selected protocols to be used for Git access.
 
     - ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type|
       - field_name = :"#{type}_key_restriction"
-      .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'
+      .form-group
+        = f.label field_name, "#{type.upcase} SSH keys", class: 'label-light'
+        = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control'
 
   = f.submit 'Save changes', class: "btn btn-success"