From e09931576b593dc86fa40402929cc7b2990aa3e3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 Jun 2022 21:08:15 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/helpers/help_page_helper.js | 7 ++++--- spec/support/helpers/prometheus_helpers.rb | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/helpers/help_page_helper.js b/app/assets/javascripts/helpers/help_page_helper.js index 0e824548646..21d27b5fea9 100644 --- a/app/assets/javascripts/helpers/help_page_helper.js +++ b/app/assets/javascripts/helpers/help_page_helper.js @@ -7,9 +7,10 @@ const HELP_PAGE_URL_ROOT = '/help/'; * * This is designed to mirror the Ruby `help_page_path` helper function, so that * the two can be used interchangeably. - * @param {String} path - Path to doc file relative to the doc/ directory in the GitLab repository. - * Optionally, including `.md` or `.html` prefix - * @param {String} options.anchor - Name of the anchor to scroll to on the documentation page. + * @param {string} path - Path to doc file relative to the doc/ directory in the GitLab repository. + * Optionally, including `.md` or `.html` prefix + * @param {object} [options] + * @param {string} [options.anchor] - Name of the anchor to scroll to on the documentation page. */ export const helpPagePath = (path, { anchor = '' } = {}) => { let helpPath = joinPaths(gon.relative_url_root || '/', HELP_PAGE_URL_ROOT, path); diff --git a/spec/support/helpers/prometheus_helpers.rb b/spec/support/helpers/prometheus_helpers.rb index 2f6b36f43c0..e1f5e6dee14 100644 --- a/spec/support/helpers/prometheus_helpers.rb +++ b/spec/support/helpers/prometheus_helpers.rb @@ -269,7 +269,7 @@ module PrometheusHelpers def prometheus_alert_payload_fingerprint(prometheus_alert) # timestamp is hard-coded in #prometheus_map_alert_payload - fingerprint = "#{prometheus_alert.id}/2018-09-24T08:57:31.095725221Z" + fingerprint = "#{prometheus_alert.prometheus_metric_id}/2018-09-24T08:57:31.095725221Z" Gitlab::AlertManagement::Fingerprint.generate(fingerprint) end