Merge branch 'bootstrap-help-block' into 'master'

Replace help-block with form-text.text-muted

Closes #46745

See merge request gitlab-org/gitlab-ce!19206

app/assets/javascripts/badges/components/badge_form.vue

@@ -160,7 +160,7 @@ export default {
         @input="debouncedPreview"
       />
       <span
-        class="help-block"
+        class="form-text text-muted"
         v-html="helpText"
       ></span>
     </div>
@@ -176,7 +176,7 @@ export default {
         @input="debouncedPreview"
       />
       <span
-        class="help-block"
+        class="form-text text-muted"
         v-html="helpText"
       ></span>
     </div>

app/assets/javascripts/ide/components/commit_sidebar/list.vue

@@ -120,7 +120,7 @@ export default {
     </ul>
     <p
       v-else
-      class="multi-file-commit-list help-block"
+      class="multi-file-commit-list form-text text-muted"
     >
       {{ __('No changes') }}
     </p>

app/assets/javascripts/ide/components/commit_sidebar/message_field.vue

@@ -80,7 +80,7 @@ export default {
             {{ __('Commit Message') }}
             <span
               v-popover="$options.popoverOptions"
-              class="help-block prepend-left-10"
+              class="form-text text-muted prepend-left-10"
             >
               <icon
                 name="question"

app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

@@ -213,7 +213,7 @@
             </i>
           </div>
         </div>
-        <span class="help-block">{{ visibilityLevelDescription }}</span>
+        <span class="form-text text-muted">{{ visibilityLevelDescription }}</span>
         <label
           v-if="visibilityLevel !== visibilityOptions.PRIVATE"
           class="request-access"

app/assets/javascripts/profile/account/components/update_username.vue

@@ -99,7 +99,7 @@ Please update your Git repository remotes as soon as possible.`),
           :disabled="isRequestPending"
         />
       </div>
-      <p class="help-block">
+      <p class="form-text text-muted">
         {{ path }}
       </p>
     </div>

app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue

@@ -132,7 +132,7 @@ export default {
       </div>
     </div>
     <span
-      class="help-block"
+      class="form-text text-muted"
       :class="{ 'gl-field-error': hasErrors }"
       v-if="hasErrors"
     >

app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue

@@ -193,7 +193,7 @@ export default {
       </div>
     </div>
     <span
-      class="help-block"
+      class="form-text text-muted"
       :class="{ 'gl-field-error': hasErrors }"
       v-html="helpText"
     ></span>

app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue

@@ -106,7 +106,7 @@ export default {
       </div>
     </div>
     <span
-      class="help-block"
+      class="form-text text-muted"
       :class="{ 'gl-field-error': hasErrors }"
       v-if="hasErrors"
     >

app/assets/stylesheets/pages/repo.scss

@@ -546,7 +546,7 @@
     margin-right: 0;
   }
 
-  &.help-block {
+  &.form-text.text-muted {
     margin-left: 0;
     right: 0;
   }
@@ -952,7 +952,7 @@
     height: 30px;
   }
 
-  .help-block {
+  .form-text.text-muted {
     margin-top: 2px;
     color: $blue-500;
     cursor: pointer;

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

@@ -9,7 +9,7 @@
           = f.label :mirror_available do
             = f.check_box :mirror_available
             Allow mirrors to be setup for projects
-        %span.help-block
+        %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')
 

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

@@ -8,7 +8,7 @@
           = f.label :enforce_terms do
             = f.check_box :enforce_terms
             = _("Require all users to accept Terms of Service when they access GitLab.")
-          .help-block
+          .form-text.text-muted
             = _("When enabled, users cannot use GitLab until the terms have been accepted.")
     .form-group
       .col-sm-12
@@ -16,7 +16,7 @@
           = _("Terms of Service Agreement")
       .col-sm-12
         = f.text_area :terms, class: 'form-control', rows: 8
-        .help-block
+        .form-text.text-muted
           = _("Markdown enabled")
 
   = f.submit _("Save changes"), class: "btn btn-success"

app/views/projects/clusters/gcp/_form.html.haml

@@ -23,7 +23,7 @@
             %span.dropdown-toggle-text
               = _('Select project')
             = icon('chevron-down')
-        %span.help-block  
+        %span.form-text.text-muted  
 
     .form-group
       = provider_gcp_field.label :zone, s_('ClusterIntegration|Zone')

app/views/projects/settings/ci_cd/_autodevops_form.html.haml

@@ -34,7 +34,7 @@
             = form.label :domain, class:"prepend-top-10" do
               = _('Domain')
             = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
-            .help-block
+            .form-text.text-muted
               = s_('CICD|A domain is required to use Auto Review Apps and Auto Deploy Stages.')
               - if cluster_ingress_ip = cluster_ingress_ip(@project)
                 = s_('%{nip_domain} can be used as an alternative to a custom domain.').html_safe % { nip_domain: "<code>#{cluster_ingress_ip}.nip.io</code>".html_safe }