[skip ci] .help-block to .form-text.text-muted

app/assets/javascripts/behaviors/requires_input.js

@@ -42,9 +42,9 @@ $.fn.requiresInput = function requiresInput() {
 function hideOrShowHelpBlock(form) {
   const selected = $('.js-select-namespace option:selected');
   if (selected.length && selected.data('optionsParent') === 'groups') {
-    form.find('.help-block').hide();
+    form.find('.form-text.text-muted').hide();
   } else if (selected.length) {
-    form.find('.help-block').show();
+    form.find('.form-text.text-muted').show();
   }
 }

app/assets/javascripts/visibility_select.js

@@ -2,7 +2,7 @@ export default class VisibilitySelect {
   constructor(container) {
     if (!container) throw new Error('VisibilitySelect requires a container element as argument 1');
     this.container = container;
-    this.helpBlock = this.container.querySelector('.help-block');
+    this.helpBlock = this.container.querySelector('.form-text.text-muted');
     this.select = this.container.querySelector('select');
   }

app/assets/stylesheets/framework/forms.scss

@@ -180,7 +180,7 @@ label {
   }
 }
-.help-block {
+.form-text.text-muted {
   margin-bottom: 0;
   margin-top: #{$grid-size / 2};
 }

app/assets/stylesheets/pages/projects.scss

@@ -9,7 +9,7 @@
 .new_project,
 .edit-project,
 .import-project {
-  .help-block {
+  .form-text.text-muted {
     margin-bottom: 10px;
   }

app/assets/stylesheets/pages/repo.scss

@@ -816,7 +816,7 @@
     font-weight: normal;
   }
-  .help-block {
+  .form-text.text-muted {
     margin-top: 0;
     line-height: 0;
   }

app/assets/stylesheets/pages/repo.scss.orig

@@ -749,7 +749,7 @@
     font-weight: normal;
   }
-  .help-block {
+  .form-text.text-muted {
     margin-top: 0;
     line-height: 0;
   }

app/assets/stylesheets/pages/settings.scss

@@ -99,7 +99,7 @@
   .bs-callout,
   .form-check:first-child,
-  .help-block {
+  .form-text.text-muted {
     margin-top: 0;
   }

app/views/abuse_reports/new.html.haml

@@ -15,7 +15,7 @@
     = f.label :message, class: 'control-label'
     .col-sm-10
       = f.text_area :message, class: "form-control", rows: 2, required: true, value: sanitize(@ref_url)
-      .help-block
+      .form-text.text-muted
         Explain the problem with this user. If appropriate, provide a link to the relevant issue or comment.
   .form-actions

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

@@ -6,7 +6,7 @@
       = f.label :admin_notification_email, 'Abuse reports notification email', class: 'control-label col-sm-2'
       .col-sm-10
         = f.text_field :admin_notification_email, class: 'form-control'
-        .help-block
+        .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"

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

@@ -20,7 +20,7 @@
       = f.label :session_expire_delay, 'Session duration (minutes)', class: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :session_expire_delay, class: 'form-control'
-        %span.help-block#session_expire_delay_help_block GitLab restart is required to apply changes
+        %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: 'control-label col-sm-2'
       .col-sm-10

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

@@ -12,19 +12,19 @@
           = f.label :sidekiq_throttling_enabled do
             = f.check_box :sidekiq_throttling_enabled
             Enable Sidekiq Job Throttling
-          .help-block
+          .form-text.text-muted
             Limit the amount of resources slow running jobs are assigned.
     .form-group
       = f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'control-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' }
-        .help-block
+        .form-text.text-muted
           Choose which queues you wish to throttle.
     .form-group
       = f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'control-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'
-        .help-block
+        .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"

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

@@ -8,14 +8,14 @@
           = f.label :auto_devops_enabled do
             = f.check_box :auto_devops_enabled
             Enabled Auto DevOps (Beta) for projects by default
-        .help-block
+        .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: 'control-label col-sm-2'
       .col-sm-10
         = f.text_field :auto_devops_domain, class: 'form-control', placeholder: 'domain.com'
-        .help-block
+        .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
       .col-sm-offset-2.col-sm-10
@@ -27,19 +27,19 @@
       = f.label :shared_runners_text, class: 'control-label col-sm-2'
       .col-sm-10
         = f.text_area :shared_runners_text, class: 'form-control', rows: 4
-        .help-block Markdown enabled
+        .form-text.text-muted Markdown enabled
     .form-group
       = f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :max_artifacts_size, class: 'form-control'
-        .help-block
+        .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: 'control-label col-sm-2'
       .col-sm-10
         = f.text_field :default_artifacts_expire_in, class: 'form-control'
-        .help-block
+        .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')

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

@@ -8,7 +8,7 @@
           = f.label :email_author_in_body do
             = f.check_box :email_author_in_body
             Include author name in notification email body
-          .help-block
+          .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.
@@ -18,7 +18,7 @@
           = f.label :html_emails_enabled do
             = f.check_box :html_emails_enabled
             Enable HTML emails
-          .help-block
+          .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.

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

@@ -6,14 +6,14 @@
       = f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :gitaly_timeout_default, class: 'form-control'
-        .help-block
+        .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: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :gitaly_timeout_fast, class: 'form-control'
-        .help-block
+        .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.
@@ -21,7 +21,7 @@
       = f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :gitaly_timeout_medium, class: 'form-control'
-        .help-block
+        .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"

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

@@ -6,7 +6,7 @@
       = f.label :help_page_text, class: 'control-label col-sm-2'
       .col-sm-10
         = f.text_area :help_page_text, class: 'form-control', rows: 4
-        .help-block Markdown enabled
+        .form-text.text-muted Markdown enabled
     .form-group
       .col-sm-offset-2.col-sm-10
         .form-check
@@ -17,6 +17,6 @@
       = f.label :help_page_support_url, 'Support page URL', class: 'control-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.help-block#support_help_block Alternate support URL for help page
+        %span.form-text.text-muted#support_help_block Alternate support URL for help page
   = f.submit 'Save changes', class: "btn btn-success"

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

@@ -22,7 +22,7 @@
       = f.label :metrics_port, 'InfluxDB port', class: 'control-label col-sm-2'
       .col-sm-10
         = f.text_field :metrics_port, class: 'form-control', placeholder: '8089'
-        .help-block
+        .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
@@ -31,7 +31,7 @@
       = f.label :metrics_pool_size, 'Connection pool size', class: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :metrics_pool_size, class: 'form-control'
-        .help-block
+        .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
@@ -40,28 +40,28 @@
       = f.label :metrics_timeout, 'Connection timeout', class: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :metrics_timeout, class: 'form-control'
-        .help-block
+        .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: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :metrics_method_call_threshold, class: 'form-control'
-        .help-block
+        .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: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :metrics_sample_interval, class: 'form-control'
-        .help-block
+        .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: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :metrics_packet_size, class: 'form-control'
-        .help-block
+        .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.

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

@@ -8,7 +8,7 @@
           = f.label :throttle_unauthenticated_enabled do
             = f.check_box :throttle_unauthenticated_enabled
             Enable unauthenticated request rate limit
-          %span.help-block
+          %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: 'control-label col-sm-2'
@@ -24,7 +24,7 @@
           = f.label :throttle_authenticated_api_enabled do
             = f.check_box :throttle_authenticated_api_enabled
             Enable authenticated API request rate limit
-          %span.help-block
+          %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: 'control-label col-sm-2'
@@ -40,7 +40,7 @@
           = f.label :throttle_authenticated_web_enabled do
             = f.check_box :throttle_authenticated_web_enabled
             Enable authenticated web request rate limit
-          %span.help-block
+          %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: 'control-label col-sm-2'

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

@@ -8,13 +8,13 @@
           = f.label :koding_enabled do
             = f.check_box :koding_enabled
             Enable Koding
-        .help-block
+        .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: 'control-label col-sm-2'
       .col-sm-10
         = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090'
-        .help-block
+        .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

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

@@ -8,7 +8,7 @@
           = f.label :sentry_enabled do
             = f.check_box :sentry_enabled
             Enable Sentry
-          .help-block
+          .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
@@ -24,7 +24,7 @@
           = f.label :clientside_sentry_enabled do
             = f.check_box :clientside_sentry_enabled
             Enable Clientside Sentry
-          .help-block
+          .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/

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

@@ -6,14 +6,14 @@
       = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'control-label col-sm-2'
       .col-sm-10
         = f.number_field :max_pages_size, class: 'form-control'
-        .help-block 0 for unlimited
+        .form-text.text-muted 0 for unlimited
     .form-group
       .col-sm-offset-2.col-sm-10
         .form-check
           = f.label :pages_domain_verification_enabled do
             = f.check_box :pages_domain_verification_enabled
             Require users to prove ownership of custom domains
-        .help-block
+        .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