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
Boxiang Sun
gitlab-ce
Commits
e1e677a6
Commit
e1e677a6
authored
Dec 17, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes after review
parent
1aa3294c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
app/views/ci/status/_mini_graph_badge.html.haml
app/views/ci/status/_mini_graph_badge.html.haml
+0
-5
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+7
-6
No files found.
app/views/ci/status/_mini_graph_badge.html.haml
deleted
100644 → 0
View file @
1aa3294c
-
status
=
subject
.
detailed_status
(
current_user
)
-
icon
=
"
#{
status
.
icon
}
_borderless"
-
klass
=
"ci-status-icon ci-status-icon-
#{
status
}
"
%span
{
class:
klass
}=
custom_icon
(
icon
)
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
e1e677a6
...
@@ -44,10 +44,11 @@
...
@@ -44,10 +44,11 @@
-
pipeline
.
stages
.
each
do
|
stage
|
-
pipeline
.
stages
.
each
do
|
stage
|
-
if
stage
.
status
-
if
stage
.
status
-
detailed_status
=
stage
.
detailed_status
(
current_user
)
-
detailed_status
=
stage
.
detailed_status
(
current_user
)
-
details_path
=
detailed_status
.
details_path
if
detailed_status
.
has_details?
-
klass
=
"has-tooltip ci-status-icon ci-status-icon-
#{
detailed_status
}
"
-
klass
=
"has-tooltip ci-status-icon ci-status-icon-
#{
detailed_status
}
"
-
hasMultipleBuilds
=
stage
.
statuses
.
count
>
1
-
hasMultipleBuilds
=
stage
.
statuses
.
count
>
1
-
tooltip
=
"
#{
stage
.
name
.
titleize
}
:
#{
stage
.
status
||
'not found'
}
"
-
icon_status
=
"
#{
detailed_status
.
icon
}
_borderless"
-
icon_status_klass
=
"ci-status-icon ci-status-icon-
#{
detailed_status
}
"
-
tooltip
=
"
#{
stage
.
name
}
:
#{
detailed_status
.
label
||
'not found'
}
"
.stage-container.mini-pipeline-graph
.stage-container.mini-pipeline-graph
-
if
hasMultipleBuilds
-
if
hasMultipleBuilds
...
@@ -55,7 +56,7 @@
...
@@ -55,7 +56,7 @@
%button
.has-tooltip.builds-dropdown
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
title:
tooltip
}
}
%button
.has-tooltip.builds-dropdown
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
title:
tooltip
}
}
%span
{
class:
klass
}
%span
{
class:
klass
}
%span
.mini-pipeline-graph-icon-container
%span
.mini-pipeline-graph-icon-container
=
render
'ci/status/mini_graph_badge'
,
subject:
stage
%span
{
class:
icon_status_klass
}=
custom_icon
(
icon_status
)
=
icon
(
'caret-down'
,
class:
'dropdown-caret'
)
=
icon
(
'caret-down'
,
class:
'dropdown-caret'
)
.dropdown-menu.grouped-pipeline-dropdown
.dropdown-menu.grouped-pipeline-dropdown
.arrow-up
.arrow-up
...
@@ -64,10 +65,10 @@
...
@@ -64,10 +65,10 @@
%li
.dropdown-build
%li
.dropdown-build
=
render
'ci/status/graph_badge'
,
subject:
status
=
render
'ci/status/graph_badge'
,
subject:
status
-
else
-
else
-
if
detail
s_path
-
if
detail
ed_status
.
has_details?
=
link_to
details_path
,
class:
klass
,
title:
tooltip
do
=
link_to
detail
ed_status
.
detail
s_path
,
class:
klass
,
title:
tooltip
do
%span
.mini-pipeline-graph-icon-container
%span
.mini-pipeline-graph-icon-container
=
render
'ci/status/mini_graph_badge'
,
subject:
stage
%span
{
class:
icon_status_klass
}=
custom_icon
(
icon_status
)
%td
%td
-
if
pipeline
.
duration
-
if
pipeline
.
duration
...
...
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