Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ff6556a8
Commit
ff6556a8
authored
Jan 07, 2021
by
Kev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use GlBadge for badges in pipeline_url.vue
parent
f98ec790
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
27 deletions
+29
-27
app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue
...ipts/pipelines/components/pipelines_list/pipeline_url.vue
+24
-27
changelogs/unreleased/296606-use-gl-badge-in-pipeline-url-component.yml
...eleased/296606-use-gl-badge-in-pipeline-url-component.yml
+5
-0
No files found.
app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue
View file @
ff6556a8
<
script
>
import
{
GlLink
,
GlPopover
,
GlSprintf
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlLink
,
GlPopover
,
GlSprintf
,
GlTooltipDirective
,
GlBadge
}
from
'
@gitlab/ui
'
;
import
{
SCHEDULE_ORIGIN
}
from
'
../../constants
'
;
export
default
{
...
...
@@ -7,6 +7,7 @@ export default {
GlLink
,
GlPopover
,
GlSprintf
,
GlBadge
,
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
...
...
@@ -57,46 +58,45 @@ export default {
</gl-link>
<div
class=
"label-container"
>
<gl-link
v-if=
"isScheduled"
:href=
"pipelineScheduleUrl"
target=
"__blank"
>
<
span
<
gl-badge
v-gl-tooltip
:title=
"__('This pipeline was triggered by a schedule.')"
class=
"badge badge-
info"
variant=
"
info"
data-testid=
"pipeline-url-scheduled"
>
{{
__
(
'
Scheduled
'
)
}}
</
span
>
{{
__
(
'
Scheduled
'
)
}}
</
gl-badge
>
</gl-link>
<
span
<
gl-badge
v-if=
"pipeline.flags.latest"
v-gl-tooltip
:title=
"__('Latest pipeline for the most recent commit on this branch')"
class=
"badge badge-
success"
variant=
"
success"
data-testid=
"pipeline-url-latest"
>
{{
__
(
'
latest
'
)
}}
</
span
>
{{
__
(
'
latest
'
)
}}
</
gl-badge
>
<
span
<
gl-badge
v-if=
"pipeline.flags.yaml_errors"
v-gl-tooltip
:title=
"pipeline.yaml_errors"
class=
"badge badge-
danger"
variant=
"
danger"
data-testid=
"pipeline-url-yaml"
>
{{
__
(
'
yaml invalid
'
)
}}
</
span
>
{{
__
(
'
yaml invalid
'
)
}}
</
gl-badge
>
<
span
<
gl-badge
v-if=
"pipeline.flags.failure_reason"
v-gl-tooltip
:title=
"pipeline.failure_reason"
class=
"badge badge-
danger"
variant=
"
danger"
data-testid=
"pipeline-url-failure"
>
{{
__
(
'
error
'
)
}}
</
span
>
{{
__
(
'
error
'
)
}}
</
gl-badge
>
<gl-link
v-if=
"pipeline.flags.auto_devops"
:id=
"`pipeline-url-autodevops-$
{pipeline.id}`"
tabindex="0"
class="badge badge-info autodevops-badge"
data-testid="pipeline-url-autodevops"
role="button"
>
{{
__
(
'
Auto DevOps
'
)
}}
</gl-link
>
<gl-badge
variant=
"info"
>
{{
__
(
'
Auto DevOps
'
)
}}
</gl-badge>
</gl-link
>
<gl-popover
:target=
"`pipeline-url-autodevops-$
{pipeline.id}`"
...
...
@@ -122,13 +122,10 @@ export default {
__('Learn more about Auto DevOps')
}}
</gl-link>
</gl-popover>
<span
v-if=
"pipeline.flags.stuck"
class=
"badge badge-warning"
data-testid=
"pipeline-url-stuck"
>
{{ __('stuck') }}
</span
>
<span
<gl-badge
v-if=
"pipeline.flags.stuck"
variant=
"warning"
data-testid=
"pipeline-url-stuck"
>
{{
__('stuck')
}}
</gl-badge>
<gl-badge
v-if=
"pipeline.flags.detached_merge_request_pipeline"
v-gl-tooltip
:title=
"
...
...
@@ -136,17 +133,17 @@ export default {
'Pipelines for merge requests are configured. A detached pipeline runs in the context of the merge request, and not against the merged result. Learn more in the documentation for Pipelines for Merged Results.',
)
"
class=
"badge badge-
info"
variant=
"
info"
data-testid=
"pipeline-url-detached"
>
{{ __('detached') }}
</
span
>
{{ __('detached') }}
</
gl-badge
>
<
span
<
gl-badge
v-if=
"isInFork"
v-gl-tooltip
:title=
"__('Pipeline ran in fork of project')"
class=
"badge badge-
info"
variant=
"
info"
data-testid=
"pipeline-url-fork"
>
{{ __('fork') }}
</
span
>
{{ __('fork') }}
</
gl-badge
>
</div>
</div>
...
...
changelogs/unreleased/296606-use-gl-badge-in-pipeline-url-component.yml
0 → 100644
View file @
ff6556a8
---
title
:
Use GlBadge for badges in pipeline_url.vue
merge_request
:
51058
author
:
Kev @KevSlashNull
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment