diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 21:10:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 21:10:35 +0300 |
commit | 3c3b7c12a0955679626545248aa2aa347d6d001d (patch) | |
tree | c46d2ad91033821457181b5c748df997fe579545 /app/assets/javascripts/alert_management | |
parent | 4a882000a94d1043b536e078a0e3571bdb0077d3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/alert_management')
-rw-r--r-- | app/assets/javascripts/alert_management/components/alert_management_table.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/alert_management/list.js | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/alert_management/components/alert_management_table.vue b/app/assets/javascripts/alert_management/components/alert_management_table.vue index 79a6bac3ba7..8ea977698e1 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_table.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_table.vue @@ -17,6 +17,7 @@ import { convertToSnakeCase } from '~/lib/utils/text_utility'; import { joinPaths, visitUrl } from '~/lib/utils/url_utility'; import { s__, __ } from '~/locale'; import AlertStatus from '~/vue_shared/alert_details/components/alert_status.vue'; +import AlertsDeprecationWarning from '~/vue_shared/components/alerts_deprecation_warning.vue'; import { tdClass, thClass, @@ -96,6 +97,7 @@ export default { severityLabels: SEVERITY_LEVELS, statusTabs: ALERTS_STATUS_TABS, components: { + AlertsDeprecationWarning, GlAlert, GlLoadingIcon, GlTable, @@ -273,6 +275,8 @@ export default { </gl-sprintf> </gl-alert> + <alerts-deprecation-warning /> + <paginated-table-with-search-and-tabs :show-error-msg="showErrorMsg" :i18n="$options.i18n" diff --git a/app/assets/javascripts/alert_management/list.js b/app/assets/javascripts/alert_management/list.js index b23f8a8eba4..e9d19f18ab5 100644 --- a/app/assets/javascripts/alert_management/list.js +++ b/app/assets/javascripts/alert_management/list.js @@ -23,6 +23,7 @@ export default () => { assigneeUsernameQuery, alertManagementEnabled, userCanEnableAlertManagement, + hasManagedPrometheus, } = domEl.dataset; const apolloProvider = new VueApollo({ @@ -64,6 +65,7 @@ export default () => { alertManagementEnabled: parseBoolean(alertManagementEnabled), trackAlertStatusUpdateOptions: PAGE_CONFIG.OPERATIONS.TRACK_ALERT_STATUS_UPDATE_OPTIONS, userCanEnableAlertManagement: parseBoolean(userCanEnableAlertManagement), + hasManagedPrometheus: parseBoolean(hasManagedPrometheus), }, apolloProvider, render(createElement) { |