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
71400fce
Commit
71400fce
authored
Jun 02, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tooltips to linked pipelines [ci-skip]
parent
e757b285
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
6 deletions
+19
-6
app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue
...avascripts/pipelines/components/graph/linked_pipeline.vue
+15
-2
app/assets/javascripts/pipelines/stores/pipeline_store.js
app/assets/javascripts/pipelines/stores/pipeline_store.js
+4
-4
No files found.
app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue
View file @
71400fce
<
script
>
<
script
>
import
ciStatus
from
'
../../../vue_shared/components/ci_icon.vue
'
;
import
ciStatus
from
'
../../../vue_shared/components/ci_icon.vue
'
;
import
tooltipMixin
from
'
../../../vue_shared/mixins/tooltip
'
;
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -20,9 +21,17 @@ export default {
...
@@ -20,9 +21,17 @@ export default {
required
:
true
,
required
:
true
,
},
},
},
},
mixins
:
[
tooltipMixin
,
],
components
:
{
components
:
{
ciStatus
,
ciStatus
,
},
},
computed
:
{
tooltipText
()
{
return
`
${
this
.
projectName
}
-
${
this
.
pipelineStatus
.
label
}
`
;
},
}
};
};
</
script
>
</
script
>
...
@@ -31,8 +40,12 @@ export default {
...
@@ -31,8 +40,12 @@ export default {
<div
class=
"curve"
></div>
<div
class=
"curve"
></div>
<div>
<div>
<a
<a
:href=
"pipelinePath"
class=
"linked-pipeline-content"
class=
"linked-pipeline-content"
>
:href=
"pipelinePath"
:title=
"tooltipText"
ref=
"tooltip"
data-toggle=
"tooltip"
data-container=
"body"
>
<span
class=
"linked-pipeline-status ci-status-text"
>
<span
class=
"linked-pipeline-status ci-status-text"
>
<ci-status
:status=
"pipelineStatus"
/>
<ci-status
:status=
"pipelineStatus"
/>
</span>
</span>
...
...
app/assets/javascripts/pipelines/stores/pipeline_store.js
View file @
71400fce
const
mockTriggerers
=
[
const
mockTriggerers
=
[
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
GitLab Shell
'
},
details
:
{
status
:
{
icon
:
'
icon_status_pending
'
,
group
:
'
pending
'
}
}
},
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
GitLab Shell
'
},
details
:
{
status
:
{
icon
:
'
icon_status_pending
'
,
group
:
'
pending
'
,
label
:
'
pending
'
}
}
},
];
];
const
mockTriggereds
=
[
const
mockTriggereds
=
[
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
GitLab EE
'
},
details
:
{
status
:
{
icon
:
'
icon_status_failed
'
,
group
:
'
failed
'
}
}
},
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
GitLab EE
'
},
details
:
{
status
:
{
icon
:
'
icon_status_failed
'
,
group
:
'
failed
'
,
label
:
'
failed
'
}
}
},
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
Gitaly
'
},
details
:
{
status
:
{
icon
:
'
icon_status_pending
'
,
group
:
'
pending
'
}
}
},
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
Gitaly
'
},
details
:
{
status
:
{
icon
:
'
icon_status_pending
'
,
group
:
'
pending
'
,
label
:
'
pending
'
}
}
},
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
GitHub
'
},
details
:
{
status
:
{
icon
:
'
icon_status_success
'
,
group
:
'
success
'
}
}
},
{
id
:
111
,
path
:
'
hello/world/tho
'
,
project
:
{
name
:
'
GitHub
'
},
details
:
{
status
:
{
icon
:
'
icon_status_success
'
,
group
:
'
success
'
,
label
:
'
success
'
}
}
},
];
];
export
default
class
PipelineStore
{
export
default
class
PipelineStore
{
...
...
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