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
694ab941
Commit
694ab941
authored
Jul 11, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rearrange and update admin builds
parent
16fda5f1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
48 deletions
+47
-48
app/views/admin/builds/_build.html.haml
app/views/admin/builds/_build.html.haml
+34
-31
app/views/admin/builds/index.html.haml
app/views/admin/builds/index.html.haml
+3
-7
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+9
-9
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+1
-1
No files found.
app/views/admin/builds/_build.html.haml
View file @
694ab941
-
project
=
build
.
project
-
project
=
build
.
project
%tr
.build
%tr
.build
.commit
%td
.status
%td
.status
=
ci_status_with_icon
(
build
.
status
)
=
ci_status_with_icon
(
build
.
status
)
%td
.build-link
%td
.branch-commit
-
if
can?
(
current_user
,
:read_build
,
build
.
project
)
-
if
can?
(
current_user
,
:read_build
,
build
.
project
)
=
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
##{build.id}
%span
##{build.id}
-
else
-
else
%strong
Build
##{build.id}
%span
##{build.id}
-
if
build
.
stuck?
-
if
build
.
stuck?
%i
.fa.fa-warning.text-warning
%i
.fa.fa-warning.text-warning
%td
-
if
project
=
link_to
project
.
name_with_namespace
,
admin_namespace_project_path
(
project
.
namespace
,
project
)
%td
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"monospace"
%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"
)
%td
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"monospace commit-id"
-
if
build
.
try
(
:runner
)
=
runner_link
(
build
.
runner
)
-
else
.light
none
%td
#{
build
.
stage
}
/
#{
build
.
name
}
%td
-
if
build
.
tags
.
any?
-
if
build
.
tags
.
any?
.label-container
-
build
.
tags
.
each
do
|
tag
|
-
build
.
tags
.
each
do
|
tag
|
%span
.label.label-primary
%span
.label.label-primary
=
tag
=
tag
...
@@ -45,12 +32,28 @@
...
@@ -45,12 +32,28 @@
-
if
build
.
try
(
:allow_failure
)
-
if
build
.
try
(
:allow_failure
)
%span
.label.label-danger
allowed to fail
%span
.label.label-danger
allowed to fail
%td
.duration
%td
-
if
project
=
link_to
project
.
name_with_namespace
,
admin_namespace_project_path
(
project
.
namespace
,
project
)
%td
-
if
build
.
try
(
:runner
)
=
runner_link
(
build
.
runner
)
-
else
.light
none
%td
#{
build
.
stage
}
/
#{
build
.
name
}
%td
-
if
build
.
duration
-
if
build
.
duration
%p
.duration
=
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"
)
%span
#{
time_ago_with_tooltip
(
build
.
finished_at
)
}
%span
#{
time_ago_with_tooltip
(
build
.
finished_at
)
}
-
if
defined?
(
coverage
)
&&
coverage
-
if
defined?
(
coverage
)
&&
coverage
...
...
app/views/admin/builds/index.html.haml
View file @
694ab941
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
.row-content-block.second-block
.row-content-block.second-block
#{
(
@scope
||
'all'
).
capitalize
}
builds
#{
(
@scope
||
'all'
).
capitalize
}
builds
%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
...
@@ -37,15 +37,11 @@
...
@@ -37,15 +37,11 @@
%thead
%thead
%tr
%tr
%th
Status
%th
Status
%th
Build ID
%th
Project
%th
Commit
%th
Commit
%th
Ref
%th
Project
%th
Runner
%th
Runner
%th
Name
%th
Name
%th
Tags
%th
%th
Duration
%th
Finished at
%th
%th
-
@builds
.
each
do
|
build
|
-
@builds
.
each
do
|
build
|
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
694ab941
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
=
ci_status_with_icon
(
build
.
status
)
=
ci_status_with_icon
(
build
.
status
)
%td
%td
%div
.branch-commit
.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
%span
##{build.id}
%span
##{build.id}
...
@@ -28,8 +28,8 @@
...
@@ -28,8 +28,8 @@
-
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"
.label-container
-
if
build
.
tags
.
any?
-
if
build
.
tags
.
any?
.label-container
-
build
.
tags
.
each
do
|
tag
|
-
build
.
tags
.
each
do
|
tag
|
%span
.label.label-primary
%span
.label.label-primary
=
tag
=
tag
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
694ab941
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
%td
%td
%div
.branch-commit
.branch-commit
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
%span
##{pipeline.id}
%span
##{pipeline.id}
-
if
pipeline
.
ref
-
if
pipeline
.
ref
...
...
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