Commit c4e4b9ab authored by Scott Hampton's avatar Scott Hampton

Merge branch '242025-migrate-bs-callout-to-glalert-in-service-credential-form' into 'master'

Migrate bs-callout to glalert in service credential form

See merge request gitlab-org/gitlab!51211
parents 07ea11f7 7f9fe07e
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { GlButton, GlFormGroup, GlFormInput, GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; import { GlButton, GlFormGroup, GlFormInput, GlIcon, GlLink, GlSprintf, GlAlert } from '@gitlab/ui';
import { escape } from 'lodash'; import { escape } from 'lodash';
import { mapState, mapActions } from 'vuex'; import { mapState, mapActions } from 'vuex';
import { DEFAULT_REGION } from '../constants'; import { DEFAULT_REGION } from '../constants';
...@@ -16,6 +16,7 @@ export default { ...@@ -16,6 +16,7 @@ export default {
GlLink, GlLink,
GlSprintf, GlSprintf,
ClipboardButton, ClipboardButton,
GlAlert,
}, },
props: { props: {
accountAndExternalIdsHelpPath: { accountAndExternalIdsHelpPath: {
...@@ -105,9 +106,14 @@ export default { ...@@ -105,9 +106,14 @@ export default {
) )
}} }}
</p> </p>
<div v-if="createRoleError" class="js-invalid-credentials bs-callout bs-callout-danger"> <gl-alert
v-if="createRoleError"
class="js-invalid-credentials gl-mb-5"
variant="danger"
:dismissible="false"
>
{{ createRoleError }} {{ createRoleError }}
</div> </gl-alert>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="gitlab-account-id">{{ __('Account ID') }}</label> <label for="gitlab-account-id">{{ __('Account ID') }}</label>
......
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