diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:45 +0300 |
| commit | aaf59610548d9b0fd01acfd50e831cbe519ecba2 (patch) | |
| tree | b6505abedcd965ebae5118b504b185b63129dc4c /app/assets/javascripts/monitoring | |
| parent | 1363ca12f1f07c634647cf55c4c16b7401098673 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring')
4 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/stacked_column.vue b/app/assets/javascripts/monitoring/components/charts/stacked_column.vue index 56a747b9d1f..66ba20c125f 100644 --- a/app/assets/javascripts/monitoring/components/charts/stacked_column.vue +++ b/app/assets/javascripts/monitoring/components/charts/stacked_column.vue @@ -68,7 +68,7 @@ export default { } }) .catch(e => { - // eslint-disable-next-line no-console, @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line no-console, @gitlab/require-i18n-strings console.error('SVG could not be rendered correctly: ', e); }); }, diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index cba0a6da6a9..f3cbdffec64 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -327,7 +327,7 @@ export default { } }) .catch(e => { - // eslint-disable-next-line no-console, @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line no-console, @gitlab/require-i18n-strings console.error('SVG could not be rendered correctly: ', e); }); }, diff --git a/app/assets/javascripts/monitoring/components/panel_type.vue b/app/assets/javascripts/monitoring/components/panel_type.vue index 4573ec58ab8..ba92b72a71d 100644 --- a/app/assets/javascripts/monitoring/components/panel_type.vue +++ b/app/assets/javascripts/monitoring/components/panel_type.vue @@ -95,7 +95,7 @@ export default { csvText() { const chartData = this.graphData.metrics[0].result[0].values; const yLabel = this.graphData.y_label; - const header = `timestamp,${yLabel}\r\n`; // eslint-disable-line @gitlab/i18n/no-non-i18n-strings + const header = `timestamp,${yLabel}\r\n`; // eslint-disable-line @gitlab/require-i18n-strings return chartData.reduce((csv, data) => { const row = data.join(','); return `${csv}${row}\r\n`; diff --git a/app/assets/javascripts/monitoring/utils.js b/app/assets/javascripts/monitoring/utils.js index 6694ae2f157..6a46c7e67e4 100644 --- a/app/assets/javascripts/monitoring/utils.js +++ b/app/assets/javascripts/monitoring/utils.js @@ -28,7 +28,7 @@ export const graphDataValidatorForValues = (isValues, graphData) => { ); }; -/* eslint-disable @gitlab/i18n/no-non-i18n-strings */ +/* eslint-disable @gitlab/require-i18n-strings */ /** * Checks that element that triggered event is located on cluster health check dashboard * @param {HTMLElement} element to check against |