BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
0c14eaa6
Commit
0c14eaa6
authored
Sep 01, 2016
by
Katarzyna Kobierska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Liken admin and project builds views to each other
parent
21976091
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
43 deletions
+31
-43
_build.html.haml
app/views/admin/builds/_build.html.haml
+6
-3
_content_list.html.haml
app/views/projects/builds/_content_list.html.haml
+22
-36
_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+3
-4
No files found.
app/views/admin/builds/_build.html.haml
View file @
0c14eaa6
...
...
@@ -45,7 +45,10 @@
.light
none
%td
#{
build
.
stage
}
/
#{
build
.
name
}
#{
build
.
stage
}
%td
#{
build
.
name
}
%td
-
if
build
.
duration
...
...
@@ -58,8 +61,8 @@
=
icon
(
"calendar"
)
%span
#{
time_ago_with_tooltip
(
build
.
finished_at
)
}
-
if
defined?
(
coverage
)
&&
coverage
%td
.
coverage
%td
.
coverage
-
if
defined?
(
coverage
)
&&
coverage
-
if
build
.
try
(
:coverage
)
#{
build
.
coverage
}
%
...
...
app/views/projects/builds/_content_list.html.haml
View file @
0c14eaa6
-
if
project
.
nil
?
-
if
builds
.
blank?
%li
.nothing-here-block
No builds to show
-
else
.table-holder
%t
able
.table.builds
%t
head
%t
r
%th
Status
%th
Commit
-
if
builds
.
blank
?
%li
.nothing-here-block
No builds to show
-
else
.table-holder
%table
.table.builds
%t
head
%t
r
%t
h
Status
%th
Commit
-
if
project
.
nil?
%th
Project
%th
Runner
%th
Name
%th
%th
%th
Stage
%th
Name
%th
%th
-
if
project
.
present?
-
if
@project
.
build_coverage_enabled?
%th
Coverage
-
if
project
.
nil?
-
builds
.
each
do
|
build
|
=
render
"admin/builds/build"
,
build:
build
=
paginate
builds
,
theme:
'gitlab'
-
if
project
.
present?
-
if
builds
.
blank?
%li
.nothing-here-block
No builds to show
-
else
.table-holder
%table
.table.builds
%thead
%tr
%th
Status
%th
Commit
%th
Stage
%th
Name
%th
-
if
project
.
build_coverage_enabled?
%th
Coverage
%th
-
else
=
render
builds
,
commit_sha:
true
,
ref:
true
,
stage:
true
,
allow_retry:
true
,
coverage:
project
.
build_coverage_enabled?
=
paginate
builds
,
theme:
'gitlab'
=
paginate
builds
,
theme:
'gitlab'
app/views/projects/ci/builds/_build.html.haml
View file @
0c14eaa6
...
...
@@ -52,12 +52,11 @@
-
else
.light
none
-
if
defined?
(
stage
)
&&
stage
%td
=
build
.
stage
%td
#{
build
.
stage
}
%td
=
build
.
name
#{
build
.
name
}
%td
-
if
build
.
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