[skip ci] Convert .checkbox to .form-check

df8aa61a · Clement Ho · b95d76d2 · df8aa61a · df8aa61a · df8aa61a
Commit df8aa61a authored Apr 11, 2018 by Clement Ho
44 changed files
--- a/app/assets/javascripts/notifications_form.js
+++ b/app/assets/javascripts/notifications_form.js
@@ -15,7 +15,7 @@ export default class NotificationsForm {
  toggleCheckbox(e) {
    const $checkbox = $(e.currentTarget);
-    const $parent = $checkbox.closest('.checkbox');
+    const $parent = $checkbox.closest('.form-check');
    this.saveEvent($checkbox, $parent);
  }

--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :gravatar_enabled do
            = f.check_box :gravatar_enabled
            Gravatar enabled
@@ -24,14 +24,14 @@
    .form-group
      = f.label :user_oauth_applications, 'User OAuth applications', class: 'control-label col-sm-2'
      .col-sm-10
-        .checkbox
+        .form-check
          = f.label :user_oauth_applications do
            = f.check_box :user_oauth_applications
            Allow users to register any application to use GitLab as an OAuth provider
    .form-group
      = f.label :user_default_external, 'New users set to external', class: 'control-label col-sm-2'
      .col-sm-10
-        .checkbox
+        .form-check
          = f.label :user_default_external do
            = f.check_box :user_default_external
            Newly registered users will by default be external

--- a/app/views/admin/application_settings/_background_jobs.html.haml
+++ b/app/views/admin/application_settings/_background_jobs.html.haml
@@ -8,7 +8,7 @@
      to take effect.
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :sidekiq_throttling_enabled do
            = f.check_box :sidekiq_throttling_enabled
            Enable Sidekiq Job Throttling

--- a/app/views/admin/application_settings/_ci_cd.html.haml
+++ b/app/views/admin/application_settings/_ci_cd.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :auto_devops_enabled do
            = f.check_box :auto_devops_enabled
            Enabled Auto DevOps (Beta) for projects by default
@@ -19,7 +19,7 @@
          = s_("AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages.")
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :shared_runners_enabled do
            = f.check_box :shared_runners_enabled
            Enable shared runners for new projects

--- a/app/views/admin/application_settings/_email.html.haml
+++ b/app/views/admin/application_settings/_email.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :email_author_in_body do
            = f.check_box :email_author_in_body
            Include author name in notification email body
@@ -14,7 +14,7 @@
            merge request or comment in the email body instead.
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :html_emails_enabled do
            = f.check_box :html_emails_enabled
            Enable HTML emails

--- a/app/views/admin/application_settings/_help_page.html.haml
+++ b/app/views/admin/application_settings/_help_page.html.haml
@@ -9,7 +9,7 @@
        .help-block Markdown enabled
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :help_page_hide_commercial_content do
            = f.check_box :help_page_hide_commercial_content
            Hide marketing-related entries from help

--- a/app/views/admin/application_settings/_influx.html.haml
+++ b/app/views/admin/application_settings/_influx.html.haml
@@ -10,7 +10,7 @@
      = link_to icon('question-circle'), help_page_path('administration/monitoring/performance/introduction')
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :metrics_enabled do
            = f.check_box :metrics_enabled
            Enable InfluxDB Metrics

--- a/app/views/admin/application_settings/_ip_limits.html.haml
+++ b/app/views/admin/application_settings/_ip_limits.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :throttle_unauthenticated_enabled do
            = f.check_box :throttle_unauthenticated_enabled
            Enable unauthenticated request rate limit
@@ -20,7 +20,7 @@
        = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control'
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :throttle_authenticated_api_enabled do
            = f.check_box :throttle_authenticated_api_enabled
            Enable authenticated API request rate limit
@@ -36,7 +36,7 @@
        = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control'
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :throttle_authenticated_web_enabled do
            = f.check_box :throttle_authenticated_web_enabled
            Enable authenticated web request rate limit

--- a/app/views/admin/application_settings/_koding.html.haml
+++ b/app/views/admin/application_settings/_koding.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :koding_enabled do
            = f.check_box :koding_enabled
            Enable Koding

--- a/app/views/admin/application_settings/_logging.html.haml
+++ b/app/views/admin/application_settings/_logging.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :sentry_enabled do
            = f.check_box :sentry_enabled
            Enable Sentry
@@ -20,7 +20,7 @@
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :clientside_sentry_enabled do
            = f.check_box :clientside_sentry_enabled
            Enable Clientside Sentry

--- a/app/views/admin/application_settings/_outbound.html.haml
+++ b/app/views/admin/application_settings/_outbound.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :allow_local_requests_from_hooks_and_services do
            = f.check_box :allow_local_requests_from_hooks_and_services
            Allow requests to the local network from hooks and services

--- a/app/views/admin/application_settings/_pages.html.haml
+++ b/app/views/admin/application_settings/_pages.html.haml
@@ -9,7 +9,7 @@
        .help-block 0 for unlimited
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :pages_domain_verification_enabled do
            = f.check_box :pages_domain_verification_enabled
            Require users to prove ownership of custom domains

--- a/app/views/admin/application_settings/_performance.html.haml
+++ b/app/views/admin/application_settings/_performance.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :authorized_keys_enabled do
            = f.check_box :authorized_keys_enabled
            Write to "authorized_keys" file

--- a/app/views/admin/application_settings/_performance_bar.html.haml
+++ b/app/views/admin/application_settings/_performance_bar.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :performance_bar_enabled do
            = f.check_box :performance_bar_enabled
            Enable the Performance Bar

--- a/app/views/admin/application_settings/_plantuml.html.haml
+++ b/app/views/admin/application_settings/_plantuml.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :plantuml_enabled do
            = f.check_box :plantuml_enabled
            Enable PlantUML

--- a/app/views/admin/application_settings/_prometheus.html.haml
+++ b/app/views/admin/application_settings/_prometheus.html.haml
@@ -13,7 +13,7 @@
      = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/index')
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :prometheus_metrics_enabled do
            = f.check_box :prometheus_metrics_enabled
            Enable Prometheus Metrics

--- a/app/views/admin/application_settings/_repository_check.html.haml
+++ b/app/views/admin/application_settings/_repository_check.html.haml
@@ -6,7 +6,7 @@
      %h4 Repository checks
      .form-group
        .col-sm-offset-2.col-sm-10
-          .checkbox
+          .form-check
            = f.label :repository_checks_enabled do
              = f.check_box :repository_checks_enabled
              Enable Repository Checks
@@ -24,7 +24,7 @@
      %h4 Housekeeping
      .form-group
        .col-sm-offset-2.col-sm-10
-          .checkbox
+          .form-check
            = f.label :housekeeping_enabled do
              = f.check_box :housekeeping_enabled
              Enable automatic repository housekeeping (git repack, git gc)
@@ -33,7 +33,7 @@
              repository access on your GitLab server will become slower and your
              repositories will use more disk space. We recommend to always leave
              this enabled.
-          .checkbox
+          .form-check
            = f.label :housekeeping_bitmaps_enabled do
              = f.check_box :housekeeping_bitmaps_enabled
              Enable Git pack file bitmap creation

--- a/app/views/admin/application_settings/_repository_storage.html.haml
+++ b/app/views/admin/application_settings/_repository_storage.html.haml
@@ -5,7 +5,7 @@
    .sub-section
      .form-group
        .col-sm-offset-2.col-sm-10
-          .checkbox
+          .form-check
            = f.label :hashed_storage_enabled do
              = f.check_box :hashed_storage_enabled
              Create new projects using hashed storage paths

--- a/app/views/admin/application_settings/_signin.html.haml
+++ b/app/views/admin/application_settings/_signin.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :password_authentication_enabled_for_web do
            = f.check_box :password_authentication_enabled_for_web
            Password authentication enabled for web interface
@@ -12,7 +12,7 @@
              When disabled, an external authentication provider must be used.
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :password_authentication_enabled_for_git do
            = f.check_box :password_authentication_enabled_for_git
            Password authentication enabled for Git over HTTP(S)
@@ -31,7 +31,7 @@
    .form-group
      = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
      .col-sm-10
-        .checkbox
+        .form-check
          = f.label :require_two_factor_authentication do
            = f.check_box :require_two_factor_authentication
            Require all users to setup Two-factor authentication

--- a/app/views/admin/application_settings/_signup.html.haml
+++ b/app/views/admin/application_settings/_signup.html.haml
@@ -4,13 +4,13 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :signup_enabled do
            = f.check_box :signup_enabled
            Sign-up enabled
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :send_user_confirmation_email do
            = f.check_box :send_user_confirmation_email
            Send confirmation email on sign-up
@@ -22,7 +22,7 @@
    .form-group
      = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'control-label col-sm-2'
      .col-sm-10
-        .checkbox
+        .form-check
          = f.label :domain_blacklist_enabled do
            = f.check_box :domain_blacklist_enabled
            Enable domain blacklist for sign ups

--- a/app/views/admin/application_settings/_spam.html.haml
+++ b/app/views/admin/application_settings/_spam.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :recaptcha_enabled do
            = f.check_box :recaptcha_enabled
            Enable reCAPTCHA
@@ -25,7 +25,7 @@
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :akismet_enabled do
            = f.check_box :akismet_enabled
            Enable Akismet
@@ -41,7 +41,7 @@
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :unique_ips_limit_enabled do
            = f.check_box :unique_ips_limit_enabled
            Limit sign in from multiple ips

--- a/app/views/admin/application_settings/_usage.html.haml
+++ b/app/views/admin/application_settings/_usage.html.haml
@@ -4,7 +4,7 @@
  %fieldset
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :version_check_enabled do
            = f.check_box :version_check_enabled
            Enable version check
@@ -15,7 +15,7 @@
    .form-group
      .col-sm-offset-2.col-sm-10
        - can_be_configured = @application_setting.usage_ping_can_be_configured?
-        .checkbox
+        .form-check
          = f.label :usage_ping_enabled do
            = f.check_box :usage_ping_enabled, disabled: !can_be_configured
            Enable usage ping

--- a/app/views/admin/application_settings/_visibility_and_access.html.haml
+++ b/app/views/admin/application_settings/_visibility_and_access.html.haml
@@ -24,7 +24,7 @@
        - checkbox_name = 'application_setting[restricted_visibility_levels][]'
        = hidden_field_tag(checkbox_name)
        - restricted_level_checkboxes('restricted-visibility-help', checkbox_name).each do |level|
-          .checkbox
+          .form-check
            = level
        %span.help-block#restricted-visibility-help
          Selected levels cannot be used by non-admin users for projects or snippets.
@@ -33,7 +33,7 @@
      = f.label :import_sources, class: 'control-label col-sm-2'
      .col-sm-10
        - import_sources_checkboxes('import-sources-help').each do |source|
-          .checkbox= source
+          .form-check= source
        %span.help-block#import-sources-help
          Enabled sources for code import during project creation. OmniAuth must be configured for GitHub
          = link_to "(?)", help_page_path("integration/github")
@@ -44,7 +44,7 @@
    .form-group
      .col-sm-offset-2.col-sm-10
-        .checkbox
+        .form-check
          = f.label :project_export_enabled do
            = f.check_box :project_export_enabled
            Project export enabled

--- a/app/views/admin/hooks/_form.html.haml
+++ b/app/views/admin/hooks/_form.html.haml
@@ -46,7 +46,7 @@
          This URL will be triggered when a merge request is created/updated/merged
 .form-group
  = form.label :enable_ssl_verification, 'SSL verification', class: 'label-light checkbox'
-  .checkbox
+  .form-check
    = form.label :enable_ssl_verification do
      = form.check_box :enable_ssl_verification
      %strong Enable SSL verification
--- a/app/views/devise/sessions/_new_base.html.haml
+++ b/app/views/devise/sessions/_new_base.html.haml
@@ -6,7 +6,7 @@
    = f.label :password
    = f.password_field :password, class: "form-control bottom", required: true, title: "This field is required."
  - if devise_mapping.rememberable?
-    .remember-me.checkbox
+    .remember-me.form-check
      %label{ for: "user_remember_me" }
        = f.check_box :remember_me, class: 'remember-me-checkbox'
        %span Remember me

--- a/app/views/devise/sessions/_new_crowd.html.haml
+++ b/app/views/devise/sessions/_new_crowd.html.haml
@@ -6,7 +6,7 @@
    = label_tag :password
    = password_field_tag :password, nil, { class: "form-control bottom", title: "This field is required.", required: true }
  - if devise_mapping.rememberable?
-    .remember-me.checkbox
+    .remember-me.form-check
      %label{ for: "remember_me" }
        = check_box_tag :remember_me, '1', false, id: 'remember_me'
        %span Remember me

--- a/app/views/devise/sessions/_new_ldap.html.haml
+++ b/app/views/devise/sessions/_new_ldap.html.haml
@@ -6,7 +6,7 @@
    = label_tag :password
    = password_field_tag :password, nil, { class: "form-control bottom", title: "This field is required.", required: true }
  - if devise_mapping.rememberable?
-    .remember-me.checkbox
+    .remember-me.form-check
      %label{ for: "remember_me" }
        = check_box_tag :remember_me, '1', false, id: 'remember_me'
        %span Remember me

--- a/app/views/devise/shared/_omniauth_box.html.haml
+++ b/app/views/devise/shared/_omniauth_box.html.haml
@@ -7,7 +7,7 @@
      %span.light
        - has_icon = provider_has_icon?(provider)
        = link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: 'oauth-login' + (has_icon ? ' oauth-image-link' : ' btn'), id: "oauth-login-#{provider}"
-    %fieldset.prepend-top-10.checkbox.remember-me
+    %fieldset.prepend-top-10.form-check.remember-me
      %label
        = check_box_tag :remember_me, nil, false, class: 'remember-me-checkbox'
        %span

--- a/app/views/groups/_create_chat_team.html.haml
+++ b/app/views/groups/_create_chat_team.html.haml
@@ -4,7 +4,7 @@
      = custom_icon('icon_mattermost')
    Mattermost
  .col-sm-10
-    .checkbox.js-toggle-container
+    .form-check.js-toggle-container
      = f.label :create_chat_team do
        .js-toggle-button= f.check_box(:create_chat_team, { checked: true }, true, false)
        Create a Mattermost team for this group

--- a/app/views/groups/_group_admin_settings.html.haml
+++ b/app/views/groups/_group_admin_settings.html.haml
@@ -2,7 +2,7 @@
  .form-group
    = f.label :lfs_enabled, 'Large File Storage', class: 'control-label'
    .col-sm-10
-      .checkbox
+      .form-check
        = f.label :lfs_enabled do
          = f.check_box :lfs_enabled, checked: @group.lfs_enabled?
          %strong
@@ -15,7 +15,7 @@
  .form-group
    = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
    .col-sm-10
-      .checkbox
+      .form-check
        = f.label :require_two_factor_authentication do
          = f.check_box :require_two_factor_authentication
          %strong
@@ -23,6 +23,6 @@
            = link_to icon('question-circle'), help_page_path('security/two_factor_authentication', anchor: 'enforcing-2fa-for-all-users-in-a-group')
  .form-group
    .col-sm-offset-2.col-sm-10
-      .checkbox
+      .form-check
        = f.text_field :two_factor_grace_period, class: 'form-control'
        .help-block Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -31,7 +31,7 @@
        %label.control-label
          = s_("GroupSettings|Share with group lock")
        .col-sm-10
-          .checkbox
+          .form-check
            = f.label :share_with_group_lock do
              = f.check_box :share_with_group_lock, disabled: !can_change_share_with_group_lock?(@group)
              %strong

--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -472,7 +472,7 @@
          %input#inputPassword3.form-control{ :placeholder => "Password", :type => "password" }/
      .form-group
        .col-sm-offset-2.col-sm-10
-          .checkbox
+          .form-check
            %label
              %input{ :type => "checkbox" }/
              Remember me
@@ -492,7 +492,7 @@
      .form-group
        %label{ :for => "exampleInputPassword1" } Password
        %input#exampleInputPassword1.form-control{ :placeholder => "Password", :type => "password" }/
-      .checkbox
+      .form-check
        %label
          %input{ :type => "checkbox" }/
          Remember me

--- a/app/views/projects/_merge_request_merge_settings.html.haml
+++ b/app/views/projects/_merge_request_merge_settings.html.haml
 - form = local_assigns.fetch(:form)
 .form-group
-  .checkbox.builds-feature{ class: ("hidden" if @project && @project.project_feature.send(:builds_access_level) == 0) }
+  .form-check.builds-feature{ class: ("hidden" if @project && @project.project_feature.send(:builds_access_level) == 0) }
    = form.label :only_allow_merge_if_pipeline_succeeds do
      = form.check_box :only_allow_merge_if_pipeline_succeeds
      %strong Only allow merge requests to be merged if the pipeline succeeds
@@ -9,15 +9,15 @@
      %span.descr
        Pipelines need to be configured to enable this feature.
        = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds'), target: '_blank'
-  .checkbox
+  .form-check
    = form.label :only_allow_merge_if_all_discussions_are_resolved do
      = form.check_box :only_allow_merge_if_all_discussions_are_resolved
      %strong Only allow merge requests to be merged if all discussions are resolved
-  .checkbox
+  .form-check
    = form.label :resolve_outdated_diff_discussions do
      = form.check_box :resolve_outdated_diff_discussions
      %strong Automatically resolve merge request diff discussions when they become outdated
-  .checkbox
+  .form-check
    = form.label :printing_merge_request_link_enabled do
      = form.check_box :printing_merge_request_link_enabled
      %strong Show link to create/view merge request when pushing from the command line
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -13,7 +13,7 @@
  = f.fields_for :deploy_keys_projects do |deploy_keys_project_form|
    .form-group
-      .checkbox
+      .form-check
        = deploy_keys_project_form.label :can_push do
          = deploy_keys_project_form.check_box :can_push
          %strong Write access allowed

--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -9,7 +9,7 @@
        = button_tag class: 'btn btn-success' do
          = icon('search')
        .inline.prepend-left-20
-          .checkbox.light
+          .form-check.light
            = label_tag :filter_ref do
              = check_box_tag :filter_ref, 1, @options[:filter_ref]
              %span= _("Begin with the selected commit")

--- a/app/views/projects/runners/_form.html.haml
+++ b/app/views/projects/runners/_form.html.haml
@@ -3,25 +3,25 @@
  .form-group
    = label :active, "Active", class: 'control-label'
    .col-sm-10
-      .checkbox
+      .form-check
        = f.check_box :active
        %span.light Paused Runners don't accept new jobs
  .form-group
    = label :protected, "Protected", class: 'control-label'
    .col-sm-10
-      .checkbox
+      .form-check
        = f.check_box :access_level, {}, 'ref_protected', 'not_protected'
        %span.light This runner will only run on pipelines triggered on protected branches
  .form-group
    = label :run_untagged, 'Run untagged jobs', class: 'control-label'
    .col-sm-10
-      .checkbox
+      .form-check
        = f.check_box :run_untagged
        %span.light Indicates whether this runner can pick jobs without tags
  .form-group
    = label :locked, 'Lock to current projects', class: 'control-label'
    .col-sm-10
-      .checkbox
+      .form-check
        = f.check_box :locked
        %span.light When a runner is locked, it cannot be assigned to other projects
  .form-group

--- a/app/views/projects/settings/ci_cd/_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_form.html.haml
@@ -90,7 +90,7 @@
        %hr
        .form-group
-          .checkbox
+          .form-check
            = f.label :public_builds do
              = f.check_box :public_builds
              %strong Public pipelines
@@ -112,7 +112,7 @@
        %hr
        .form-group
-          .checkbox
+          .form-check
            = f.label :auto_cancel_pending_pipelines do
              = f.check_box :auto_cancel_pending_pipelines, {}, 'enabled', 'disabled'
              %strong Auto-cancel redundant, pending pipelines

--- a/app/views/shared/_allow_request_access.html.haml
+++ b/app/views/shared/_allow_request_access.html.haml
-.checkbox
+.form-check
  = form.label :request_access_enabled do
    = form.check_box :request_access_enabled
    %strong Allow users to request access

--- a/app/views/shared/_new_merge_request_checkbox.html.haml
+++ b/app/views/shared/_new_merge_request_checkbox.html.haml
-.checkbox
+.form-check
  - nonce = SecureRandom.hex
  = label_tag "create_merge_request-#{nonce}" do
    = check_box_tag 'create_merge_request', 1, true, class: 'js-create-merge-request', id: "create_merge_request-#{nonce}"

--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -22,7 +22,7 @@
 - if issuable.respond_to?(:confidential)
  .form-group
    .col-sm-offset-2.col-sm-10
-      .checkbox
+      .form-check
        = form.label :confidential do
          = form.check_box :confidential
          This issue is confidential and should only be visible to team members with at least Reporter access.

--- a/app/views/shared/issuable/form/_contribution.html.haml
+++ b/app/views/shared/issuable/form/_contribution.html.haml
@@ -11,7 +11,7 @@
  .control-label
    = _('Contribution')
  .col-sm-10
-    .checkbox
+    .form-check
      = form.label :allow_maintainer_to_push do
        = form.check_box :allow_maintainer_to_push, disabled: !issuable.can_allow_maintainer_to_push?(current_user)
        = _('Allow edits from maintainers.')

--- a/app/views/shared/issuable/form/_merge_params.html.haml
+++ b/app/views/shared/issuable/form/_merge_params.html.haml
@@ -10,7 +10,7 @@
 .form-group
  .col-sm-10.col-sm-offset-2
    - if issuable.can_remove_source_branch?(current_user)
-      .checkbox
+      .form-check
        = label_tag 'merge_request[force_remove_source_branch]' do
          = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
          = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?

--- a/app/views/shared/notifications/_custom_notifications.html.haml
+++ b/app/views/shared/notifications/_custom_notifications.html.haml
@@ -22,7 +22,7 @@
                - NotificationSetting::EMAIL_EVENTS.each_with_index do |event, index|
                  - field_id = "#{notifications_menu_identifier("modal", notification_setting)}_notification_setting[#{event}]"
                  .form-group
-                    .checkbox{ class: ("prepend-top-0" if index == 0) }
+                    .form-check{ class: ("prepend-top-0" if index == 0) }
                      %label{ for: field_id }
                        = check_box("notification_setting", event, id: field_id, class: "js-custom-notification-event", checked: notification_setting.public_send(event))
                        %strong

--- a/app/views/shared/web_hooks/_form.html.haml
+++ b/app/views/shared/web_hooks/_form.html.haml
@@ -83,7 +83,7 @@
          This URL will be triggered when a wiki page is created/updated
 .form-group
  = form.label :enable_ssl_verification, 'SSL verification', class: 'label-light checkbox'
-  .checkbox
+  .form-check
    = form.label :enable_ssl_verification do
      = form.check_box :enable_ssl_verification
      %strong Enable SSL verification