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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
446eecb8
Commit
446eecb8
authored
Jul 07, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move pipeline ID to commit column; add status; branch style updates
parent
47199c35
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
7 deletions
+38
-7
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+31
-1
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+5
-4
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/builds.scss
View file @
446eecb8
...
...
@@ -83,7 +83,37 @@
}
}
table
.builds
{
.table.builds
{
tr
{
th
{
padding
:
18px
10px
;
border
:
none
;
}
}
tbody
{
border-top-width
:
1px
;
}
.branch-commit
{
.branch-name
{
max-width
:
180px
;
overflow
:
hidden
;
display
:
inline-block
;
white-space
:
nowrap
;
vertical-align
:
top
;
text-overflow
:
ellipsis
;
margin-left
:
10px
;
}
.commit-id
{
color
:
$gl-link-color
;
}
}
.build-link
{
a
{
color
:
$gl-dark-link-color
;
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
446eecb8
-
status
=
pipeline
.
status
%tr
.commit
%td
.commit-link
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
,
class:
"ci-status ci-
#{
status
}
"
do
=
ci_
icon_for_status
(
status
)
%strong
##{pipeline.id}
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
=
ci_
status_with_icon
(
status
)
%td
%div
.branch-commit
%span
##{pipeline.id}
-
if
pipeline
.
ref
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
pipeline
.
ref
),
class:
"monospace"
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
pipeline
.
ref
),
class:
"monospace
branch-name
"
·
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
pipeline
.
sha
),
class:
"commit-id monospace"
...
...
app/views/projects/pipelines/index.html.haml
View file @
446eecb8
...
...
@@ -45,13 +45,13 @@
.table-holder
%table
.table.builds
%tbody
%th
ID
%th
Status
%th
Commit
-
stages
.
each
do
|
stage
|
%th
.stage
%span
.has-tooltip
{
title:
"#{stage.titleize}"
}
=
stage
.
titleize
%
th
Duration
%
%th
%th
=
render
@pipelines
,
commit_sha:
true
,
stage:
true
,
allow_retry:
true
,
stages:
stages
...
...
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