Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
466b5db13b
commit
e09931576b
|
@ -7,9 +7,10 @@ const HELP_PAGE_URL_ROOT = '/help/';
|
||||||
*
|
*
|
||||||
* This is designed to mirror the Ruby `help_page_path` helper function, so that
|
* This is designed to mirror the Ruby `help_page_path` helper function, so that
|
||||||
* the two can be used interchangeably.
|
* the two can be used interchangeably.
|
||||||
* @param {String} path - Path to doc file relative to the doc/ directory in the GitLab repository.
|
* @param {string} path - Path to doc file relative to the doc/ directory in the GitLab repository.
|
||||||
* Optionally, including `.md` or `.html` prefix
|
* Optionally, including `.md` or `.html` prefix
|
||||||
* @param {String} options.anchor - Name of the anchor to scroll to on the documentation page.
|
* @param {object} [options]
|
||||||
|
* @param {string} [options.anchor] - Name of the anchor to scroll to on the documentation page.
|
||||||
*/
|
*/
|
||||||
export const helpPagePath = (path, { anchor = '' } = {}) => {
|
export const helpPagePath = (path, { anchor = '' } = {}) => {
|
||||||
let helpPath = joinPaths(gon.relative_url_root || '/', HELP_PAGE_URL_ROOT, path);
|
let helpPath = joinPaths(gon.relative_url_root || '/', HELP_PAGE_URL_ROOT, path);
|
||||||
|
|
|
@ -269,7 +269,7 @@ module PrometheusHelpers
|
||||||
|
|
||||||
def prometheus_alert_payload_fingerprint(prometheus_alert)
|
def prometheus_alert_payload_fingerprint(prometheus_alert)
|
||||||
# timestamp is hard-coded in #prometheus_map_alert_payload
|
# 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)
|
Gitlab::AlertManagement::Fingerprint.generate(fingerprint)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue