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
e24cd0b7
Commit
e24cd0b7
authored
Mar 01, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moves EE diferences to CE for mr_widget_pipeline
parent
31353188
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
14 deletions
+36
-14
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
...ue_merge_request_widget/components/mr_widget_pipeline.vue
+21
-14
app/assets/javascripts/vue_merge_request_widget/mixins/mr_widget_pipeline.js
...pts/vue_merge_request_widget/mixins/mr_widget_pipeline.js
+15
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file @
e24cd0b7
...
...
@@ -5,6 +5,7 @@ import PipelineStage from '~/pipelines/components/stage.vue';
import
CiIcon
from
'
~/vue_shared/components/ci_icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
TooltipOnTruncate
from
'
~/vue_shared/components/tooltip_on_truncate.vue
'
;
import
mrWidgetPipelineMixin
from
'
ee_else_ce/vue_merge_request_widget/mixins/mr_widget_pipeline
'
;
export
default
{
name
:
'
MRWidgetPipeline
'
,
...
...
@@ -13,7 +14,10 @@ export default {
CiIcon
,
Icon
,
TooltipOnTruncate
,
LinkedPipelinesMiniList
:
()
=>
import
(
'
ee_component/vue_shared/components/linked_pipelines_mini_list.vue
'
),
},
mixins
:
[
mrWidgetPipelineMixin
],
props
:
{
pipeline
:
{
type
:
Object
,
...
...
@@ -82,8 +86,7 @@ export default {
<div
v-if=
"hasPipeline || hasCIError"
class=
"ci-widget media"
>
<template
v-if=
"hasCIError"
>
<div
class=
"add-border ci-status-icon ci-status-icon-failed ci-error
js-ci-error append-right-default"
class=
"add-border ci-status-icon ci-status-icon-failed ci-error js-ci-error append-right-default"
>
<icon
:size=
"32"
name=
"status_failed_borderless"
/>
</div>
...
...
@@ -101,16 +104,13 @@ export default {
<a
:href=
"pipeline.path"
class=
"pipeline-id font-weight-normal pipeline-number"
>
#
{{
pipeline
.
id
}}
</a
>
{{
pipeline
.
details
.
status
.
label
}}
<template
v-if=
"hasCommitInfo"
>
for
<a
:href=
"pipeline.commit.commit_path"
class=
"commit-sha js-commit-link font-weight-normal"
>
{{
pipeline
.
commit
.
short_id
}}
</a
>
{{
pipeline
.
commit
.
short_id
}}
</a
>
on
<tooltip-on-truncate
...
...
@@ -126,15 +126,22 @@ export default {
</div>
<div>
<span
class=
"mr-widget-pipeline-graph"
>
<span
v-if=
"hasStages"
class=
"stage-cell"
>
<div
v-for=
"(stage, i) in pipeline.details.stages"
:key=
"i"
class=
"stage-container dropdown js-mini-pipeline-graph mr-widget-pipeline-stages"
>
<pipeline-stage
:stage=
"stage"
/>
</div>
<span
class=
"stage-cell"
>
<linked-pipelines-mini-list
v-if=
"triggeredBy.length"
:triggered-by=
"triggeredBy"
/>
<
template
v-if=
"hasStages"
>
<div
v-for=
"(stage, i) in pipeline.details.stages"
:key=
"i"
:class=
"
{
'has-downstream': hasDownstream(i),
}"
class="stage-container dropdown js-mini-pipeline-graph mr-widget-pipeline-stages"
>
<pipeline-stage
:stage=
"stage"
/>
</div>
</
template
>
</span>
<linked-pipelines-mini-list
v-if=
"triggered.length"
:triggered=
"triggered"
/>
</span>
</div>
</div>
...
...
app/assets/javascripts/vue_merge_request_widget/mixins/mr_widget_pipeline.js
0 → 100644
View file @
e24cd0b7
export
default
{
computed
:
{
triggered
()
{
return
[];
},
triggeredBy
()
{
return
[];
},
},
methods
:
{
hasDownstream
()
{
return
false
;
},
},
};
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