kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2022-06-24 21:08:15 +00:00
parent 466b5db13b
commit e09931576b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/helpers/help_page_helper.js
View File

@ -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);

2
spec/support/helpers/prometheus_helpers.rb
View File

@ -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