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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
50fffb5f
Commit
50fffb5f
authored
Jun 13, 2017
by
winh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle missing pipeline in merge request widget
parent
07742c02
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
...vue_merge_request_widget/components/mr_widget_pipeline.js
+8
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
View file @
50fffb5f
...
@@ -17,6 +17,9 @@ export default {
...
@@ -17,6 +17,9 @@ export default {
return
hasCI
&&
!
ciStatus
;
return
hasCI
&&
!
ciStatus
;
},
},
hasPipeline
()
{
return
Object
.
keys
(
this
.
mr
.
pipeline
||
{}).
length
>
0
;
},
svg
()
{
svg
()
{
return
statusIconEntityMap
.
icon_status_failed
;
return
statusIconEntityMap
.
icon_status_failed
;
},
},
...
@@ -30,7 +33,11 @@ export default {
...
@@ -30,7 +33,11 @@ export default {
template
:
`
template
:
`
<div class="mr-widget-heading">
<div class="mr-widget-heading">
<div class="ci-widget">
<div class="ci-widget">
<template v-if="hasCIError">
<template v-if="!hasPipeline">
<i class="fa fa-spinner fa-spin append-right-10" aria-hidden="true"></i>
Waiting for pipeline...
</template>
<template v-else-if="hasCIError">
<div class="ci-status-icon ci-status-icon-failed ci-error js-ci-error">
<div class="ci-status-icon ci-status-icon-failed ci-error js-ci-error">
<span class="js-icon-link icon-link">
<span class="js-icon-link icon-link">
<span
<span
...
...
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