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
16fda5f1
Commit
16fda5f1
authored
Jul 11, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update builds page
parent
a87a0ffd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
57 deletions
+56
-57
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+14
-11
app/views/projects/builds/index.html.haml
app/views/projects/builds/index.html.haml
+2
-6
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+40
-40
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
16fda5f1
...
@@ -7,10 +7,6 @@
...
@@ -7,10 +7,6 @@
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
.duration
,
.finished-at
{
margin
:
4px
0
;
}
.commit-title
{
.commit-title
{
margin
:
0
;
margin
:
0
;
}
}
...
@@ -24,9 +20,13 @@
...
@@ -24,9 +20,13 @@
}
}
}
}
.content-list.pipelines
{
.content-list
{
&
.pipelines
,
&
.builds-content-list
{
width
:
100%
;
width
:
100%
;
overflow
:
auto
;
overflow
:
auto
;
}
}
}
.table.builds
{
.table.builds
{
...
@@ -76,11 +76,16 @@
...
@@ -76,11 +76,16 @@
.avatar
{
.avatar
{
margin-left
:
0
;
margin-left
:
0
;
}
}
.label-container
{
margin-top
:
5px
;
}
}
}
.duration
,
.duration
,
.finished-at
{
.finished-at
{
color
:
$table-text-gray
;
color
:
$table-text-gray
;
margin
:
4px
0
;
.fa
{
.fa
{
margin-right
:
5px
;
margin-right
:
5px
;
...
@@ -91,6 +96,7 @@
...
@@ -91,6 +96,7 @@
.btn
{
.btn
{
margin
:
0
;
margin
:
0
;
color
:
$table-text-gray
;
}
}
.dropdown-toggle
,
.dropdown-toggle
,
...
@@ -113,9 +119,6 @@
...
@@ -113,9 +119,6 @@
.btn-default
{
.btn-default
{
background-color
:
$white-normal
;
background-color
:
$white-normal
;
border-color
:
$border-white-normal
;
border-color
:
$border-white-normal
;
&
:hover
{
}
}
}
}
}
}
}
...
...
app/views/projects/builds/index.html.haml
View file @
16fda5f1
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
=
link_to
ci_lint_path
,
class:
'btn btn-default'
do
=
link_to
ci_lint_path
,
class:
'btn btn-default'
do
%span
CI Lint
%span
CI Lint
%ul
.content-list
%ul
.content-list
.builds-content-list
-
if
@builds
.
blank?
-
if
@builds
.
blank?
%li
%li
.nothing-here-block
No builds to show
.nothing-here-block
No builds to show
...
@@ -46,14 +46,10 @@
...
@@ -46,14 +46,10 @@
%thead
%thead
%tr
%tr
%th
Status
%th
Status
%th
Build ID
%th
Commit
%th
Commit
%th
Ref
%th
Stage
%th
Stage
%th
Name
%th
Name
%th
Tags
%th
%th
Duration
%th
Finished at
-
if
@project
.
build_coverage_enabled?
-
if
@project
.
build_coverage_enabled?
%th
Coverage
%th
Coverage
%th
%th
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
16fda5f1
%tr
.build
%tr
.build
.commit
%td
.status
%td
.status
-
if
can?
(
current_user
,
:read_build
,
build
)
-
if
can?
(
current_user
,
:read_build
,
build
)
=
ci_status_with_icon
(
build
.
status
,
namespace_project_build_url
(
build
.
project
.
namespace
,
build
.
project
,
build
))
=
ci_status_with_icon
(
build
.
status
,
namespace_project_build_url
(
build
.
project
.
namespace
,
build
.
project
,
build
))
-
else
-
else
=
ci_status_with_icon
(
build
.
status
)
=
ci_status_with_icon
(
build
.
status
)
%td
.build-link
%td
%div
.branch-commit
-
if
can?
(
current_user
,
:read_build
,
build
)
-
if
can?
(
current_user
,
:read_build
,
build
)
=
link_to
namespace_project_build_url
(
build
.
project
.
namespace
,
build
.
project
,
build
)
do
=
link_to
namespace_project_build_url
(
build
.
project
.
namespace
,
build
.
project
,
build
)
do
%strong
##{build.id}
%span
##{build.id}
-
else
-
else
%strong
##{build.id}
%span
##{build.id}
-
if
build
.
stuck?
-
if
build
.
stuck?
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build is stuck. Check runners.'
)
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build is stuck. Check runners.'
)
-
if
defined?
(
retried
)
&&
retried
-
if
defined?
(
retried
)
&&
retried
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build was retried.'
)
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build was retried.'
)
-
if
defined?
(
commit_sha
)
&&
commit_sha
%td
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"monospace"
-
if
defined?
(
ref
)
&&
ref
-
if
defined?
(
ref
)
&&
ref
%td
-
if
build
.
ref
-
if
build
.
ref
=
link_to
build
.
ref
,
namespace_project_commits_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
ref
)
=
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
=
icon
(
"code-fork"
)
-
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"
.label-container
-
if
build
.
tags
.
any?
-
build
.
tags
.
each
do
|
tag
|
%span
.label.label-primary
=
tag
-
if
build
.
try
(
:trigger_request
)
%span
.label.label-info
triggered
-
if
build
.
try
(
:allow_failure
)
%span
.label.label-danger
allowed to fail
-
if
defined?
(
retried
)
&&
retried
%span
.label.label-warning
retried
-
if
defined?
(
runner
)
&&
runner
-
if
defined?
(
runner
)
&&
runner
%td
%td
...
@@ -43,25 +56,12 @@
...
@@ -43,25 +56,12 @@
=
build
.
name
=
build
.
name
%td
%td
.label-container
-
if
build
.
tags
.
any?
-
build
.
tags
.
each
do
|
tag
|
%span
.label.label-primary
=
tag
-
if
build
.
try
(
:trigger_request
)
%span
.label.label-info
triggered
-
if
build
.
try
(
:allow_failure
)
%span
.label.label-danger
allowed to fail
-
if
defined?
(
retried
)
&&
retried
%span
.label.label-warning
retried
%td
.duration
-
if
build
.
duration
-
if
build
.
duration
%p
.duration
=
icon
(
"clock-o"
)
=
icon
(
"clock-o"
)
#{
duration_in_words
(
build
.
finished_at
,
build
.
started_at
)
}
#{
duration_in_words
(
build
.
finished_at
,
build
.
started_at
)
}
%td
.timestamp
-
if
build
.
finished_at
-
if
build
.
finished_at
%p
.finished-at
=
icon
(
"calendar"
)
=
icon
(
"calendar"
)
%span
#{
time_ago_with_tooltip
(
build
.
finished_at
)
}
%span
#{
time_ago_with_tooltip
(
build
.
finished_at
)
}
...
@@ -81,4 +81,4 @@
...
@@ -81,4 +81,4 @@
=
icon
(
'remove'
,
class:
'cred'
)
=
icon
(
'remove'
,
class:
'cred'
)
-
elsif
defined?
(
allow_retry
)
&&
allow_retry
&&
build
.
retryable?
-
elsif
defined?
(
allow_retry
)
&&
allow_retry
&&
build
.
retryable?
=
link_to
retry_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Retry'
,
class:
'btn btn-build'
do
=
link_to
retry_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Retry'
,
class:
'btn btn-build'
do
=
icon
(
're
fresh
'
)
=
icon
(
're
peat
'
)
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