Commit 2378056c authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '242026-gl-alert-pipeline-ide' into 'master'

Update ide pipeline alert to use gitlab ui

See merge request gitlab-org/gitlab!49634
parents 847e6a65 3e15ec54
...@@ -8,6 +8,7 @@ import { ...@@ -8,6 +8,7 @@ import {
GlTabs, GlTabs,
GlTab, GlTab,
GlBadge, GlBadge,
GlAlert,
} from '@gitlab/ui'; } from '@gitlab/ui';
import { sprintf, __ } from '../../../locale'; import { sprintf, __ } from '../../../locale';
import CiIcon from '../../../vue_shared/components/ci_icon.vue'; import CiIcon from '../../../vue_shared/components/ci_icon.vue';
...@@ -26,6 +27,7 @@ export default { ...@@ -26,6 +27,7 @@ export default {
GlTabs, GlTabs,
GlTab, GlTab,
GlBadge, GlBadge,
GlAlert,
}, },
directives: { directives: {
SafeHtml, SafeHtml,
...@@ -89,11 +91,16 @@ export default { ...@@ -89,11 +91,16 @@ export default {
:can-set-ci="true" :can-set-ci="true"
class="mb-auto mt-auto" class="mb-auto mt-auto"
/> />
<div v-else-if="latestPipeline.yamlError" class="bs-callout bs-callout-danger"> <gl-alert
v-else-if="latestPipeline.yamlError"
variant="danger"
:dismissible="false"
class="gl-mt-5"
>
<p class="gl-mb-0">{{ __('Found errors in your .gitlab-ci.yml:') }}</p> <p class="gl-mb-0">{{ __('Found errors in your .gitlab-ci.yml:') }}</p>
<p class="gl-mb-0 break-word">{{ latestPipeline.yamlError }}</p> <p class="gl-mb-0 break-word">{{ latestPipeline.yamlError }}</p>
<p v-safe-html="ciLintText" class="gl-mb-0"></p> <p v-safe-html="ciLintText" class="gl-mb-0"></p>
</div> </gl-alert>
<gl-tabs v-else> <gl-tabs v-else>
<gl-tab :active="!pipelineFailed"> <gl-tab :active="!pipelineFailed">
<template #title> <template #title>
......
---
title: Update ide pipeline alert to use gitlab ui
merge_request: 49634
author:
type: changed
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