Commit ecf1a375 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'bs-callout-application-row' into 'master'

Migrate application row bs-callout to glalert

Closes #242021

See merge request gitlab-org/gitlab!40756
parents 378acdbf a55cb3fd
<script> <script>
import { GlLink, GlModalDirective, GlSprintf, GlButton } from '@gitlab/ui'; import { GlLink, GlModalDirective, GlSprintf, GlButton, GlAlert } from '@gitlab/ui';
import { s__, __, sprintf } from '~/locale'; import { s__, __, sprintf } from '~/locale';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import identicon from '../../vue_shared/components/identicon.vue'; import identicon from '../../vue_shared/components/identicon.vue';
...@@ -14,6 +14,7 @@ export default { ...@@ -14,6 +14,7 @@ export default {
GlButton, GlButton,
identicon, identicon,
GlLink, GlLink,
GlAlert,
GlSprintf, GlSprintf,
UninstallApplicationButton, UninstallApplicationButton,
UninstallApplicationConfirmationModal, UninstallApplicationConfirmationModal,
...@@ -381,12 +382,14 @@ export default { ...@@ -381,12 +382,14 @@ export default {
</template> </template>
</div> </div>
<div <gl-alert
v-if="updateFailed && !isUpdating" v-if="updateFailed && !isUpdating"
class="bs-callout bs-callout-danger cluster-application-banner mt-2 mb-0 js-cluster-application-update-details" variant="danger"
:dismissible="false"
class="gl-mt-3 gl-mb-0 js-cluster-application-update-details"
> >
{{ updateFailureDescription }} {{ updateFailureDescription }}
</div> </gl-alert>
<template v-if="updateAvailable || updateFailed || isUpdating"> <template v-if="updateAvailable || updateFailed || isUpdating">
<template v-if="updatingNeedsConfirmation"> <template v-if="updatingNeedsConfirmation">
<gl-button <gl-button
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment