diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/prometheus_metrics | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
download | gitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/prometheus_metrics')
-rw-r--r-- | app/assets/javascripts/prometheus_metrics/custom_metrics.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/prometheus_metrics/prometheus_metrics.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/prometheus_metrics/custom_metrics.js b/app/assets/javascripts/prometheus_metrics/custom_metrics.js index e891b8bf3b6..e10b5bf1807 100644 --- a/app/assets/javascripts/prometheus_metrics/custom_metrics.js +++ b/app/assets/javascripts/prometheus_metrics/custom_metrics.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import { escape, sortBy } from 'lodash'; -import PrometheusMetrics from './prometheus_metrics'; -import PANEL_STATE from './constants'; import axios from '~/lib/utils/axios_utils'; -import { s__ } from '~/locale'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; +import { s__ } from '~/locale'; +import PANEL_STATE from './constants'; +import PrometheusMetrics from './prometheus_metrics'; export default class CustomMetrics extends PrometheusMetrics { constructor(wrapperSelector) { diff --git a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js index 57f9cec9682..821de0560cd 100644 --- a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js +++ b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import { escape } from 'lodash'; import { s__, n__, sprintf } from '~/locale'; import axios from '../lib/utils/axios_utils'; -import PANEL_STATE from './constants'; import { backOff } from '../lib/utils/common_utils'; +import PANEL_STATE from './constants'; export default class PrometheusMetrics { constructor(wrapperSelector) { |