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
Léo-Paul Géneau
gitlab-ce
Commits
d49e6f35
Commit
d49e6f35
authored
Jul 27, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add pipeline icon to admin builds; position warning icon after sha
parent
15654eca
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
app/views/admin/builds/_build.html.haml
app/views/admin/builds/_build.html.haml
+4
-3
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+5
-8
No files found.
app/views/admin/builds/_build.html.haml
View file @
d49e6f35
...
@@ -11,16 +11,17 @@
...
@@ -11,16 +11,17 @@
-
else
-
else
%span
.build-link
##{build.id}
%span
.build-link
##{build.id}
-
if
build
.
stuck?
%i
.fa.fa-warning.text-warning
-
if
build
.
ref
-
if
build
.
ref
.icon-container
=
build
.
tag?
?
icon
(
'tag'
)
:
icon
(
'code-fork'
)
=
link_to
build
.
ref
,
namespace_project_commits_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
ref
),
class:
"monospace branch-name"
=
link_to
build
.
ref
,
namespace_project_commits_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
ref
),
class:
"monospace branch-name"
-
else
-
else
.light
none
.light
none
=
custom_icon
(
"icon_commit"
)
=
custom_icon
(
"icon_commit"
)
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"monospace commit-id"
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"monospace commit-id"
-
if
build
.
stuck?
%i
.fa.fa-warning.text-warning
.label-container
.label-container
-
if
build
.
tags
.
any?
-
if
build
.
tags
.
any?
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
d49e6f35
...
@@ -13,13 +13,6 @@
...
@@ -13,13 +13,6 @@
-
else
-
else
%span
##{build.id}
%span
##{build.id}
-
if
build
.
stuck?
.icon-container
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build is stuck. Check runners.'
)
-
if
defined?
(
retried
)
&&
retried
.icon-container
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build was retried.'
)
-
if
defined?
(
ref
)
&&
ref
-
if
defined?
(
ref
)
&&
ref
-
if
build
.
ref
-
if
build
.
ref
.icon-container
.icon-container
...
@@ -33,6 +26,11 @@
...
@@ -33,6 +26,11 @@
-
if
defined?
(
commit_sha
)
&&
commit_sha
-
if
defined?
(
commit_sha
)
&&
commit_sha
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"commit-id monospace"
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"commit-id monospace"
-
if
build
.
stuck?
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build is stuck. Check runners.'
)
-
if
defined?
(
retried
)
&&
retried
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build was retried.'
)
.label-container
.label-container
-
if
build
.
tags
.
any?
-
if
build
.
tags
.
any?
-
build
.
tags
.
each
do
|
tag
|
-
build
.
tags
.
each
do
|
tag
|
...
@@ -47,7 +45,6 @@
...
@@ -47,7 +45,6 @@
-
if
build
.
manual?
-
if
build
.
manual?
%span
.label.label-info
manual
%span
.label.label-info
manual
-
if
defined?
(
runner
)
&&
runner
-
if
defined?
(
runner
)
&&
runner
%td
%td
-
if
build
.
try
(
:runner
)
-
if
build
.
try
(
:runner
)
...
...
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