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
d3b6c185
Commit
d3b6c185
authored
Jun 15, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move builds tab to admin overview
parent
d1c3f3d8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
59 additions
and
54 deletions
+59
-54
app/views/admin/builds/index.html.haml
app/views/admin/builds/index.html.haml
+54
-49
app/views/admin/dashboard/_head.html.haml
app/views/admin/dashboard/_head.html.haml
+4
-0
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+1
-5
No files found.
app/views/admin/builds/index.html.haml
View file @
d3b6c185
.top-area
-
@no_container
=
true
%ul
.nav-links
=
render
"admin/dashboard/head"
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
=
link_to
admin_builds_path
do
%div
{
class:
(
container_class
)
}
All
%span
.badge.js-totalbuilds-count
=
@all_builds
.
count
(
:id
)
.top-area
%ul
.nav-links
%li
{
class:
(
'active'
if
@scope
==
'running'
)}
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
=
link_to
admin_builds_path
(
scope: :running
)
do
=
link_to
admin_builds_path
do
Running
All
%span
.badge.js-running-count
=
number_with_delimiter
(
@all_builds
.
running_or_pending
.
count
(
:id
))
%span
.badge.js-totalbuilds-count
=
@all_builds
.
count
(
:id
)
%li
{
class:
(
'active'
if
@scope
==
'finished'
)}
%li
{
class:
(
'active'
if
@scope
==
'running'
)}
=
link_to
admin_builds_path
(
scope: :finished
)
do
=
link_to
admin_builds_path
(
scope: :running
)
do
Finished
Running
%span
.badge.js-running-count
=
number_with_delimiter
(
@all_builds
.
finished
.
count
(
:id
))
%span
.badge.js-running-count
=
number_with_delimiter
(
@all_builds
.
running_or_pending
.
count
(
:id
))
.nav-controls
%li
{
class:
(
'active'
if
@scope
==
'finished'
)}
-
if
@all_builds
.
running_or_pending
.
any?
=
link_to
admin_builds_path
(
scope: :finished
)
do
=
link_to
'Cancel all'
,
cancel_all_admin_builds_path
,
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
Finished
%span
.badge.js-running-count
=
number_with_delimiter
(
@all_builds
.
finished
.
count
(
:id
))
.row-content-block.second-block
#{
(
@scope
||
'all'
).
capitalize
}
builds
.nav-controls
-
if
@all_builds
.
running_or_pending
.
any?
%ul
.content-list
=
link_to
'Cancel all'
,
cancel_all_admin_builds_path
,
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
-
if
@builds
.
blank?
%li
.row-content-block.second-block
.nothing-here-block
No builds to show
#{
(
@scope
||
'all'
).
capitalize
}
builds
-
else
.table-holder
%ul
.content-list
%table
.table.builds
-
if
@builds
.
blank?
%thead
%li
%tr
.nothing-here-block
No builds to show
%th
Status
-
else
%th
Build ID
.table-holder
%th
Project
%table
.table.builds
%th
Commit
%thead
%th
Ref
%tr
%th
Runner
%th
Status
%th
Name
%th
Build ID
%th
Tags
%th
Project
%th
Duration
%th
Commit
%th
Finished at
%th
Ref
%th
%th
Runner
%th
Name
-
@builds
.
each
do
|
build
|
%th
Tags
=
render
"admin/builds/build"
,
build:
build
%th
Duration
%th
Finished at
=
paginate
@builds
,
theme:
'gitlab'
%th
-
@builds
.
each
do
|
build
|
=
render
"admin/builds/build"
,
build:
build
=
paginate
@builds
,
theme:
'gitlab'
app/views/admin/dashboard/_head.html.haml
View file @
d3b6c185
...
@@ -4,6 +4,10 @@
...
@@ -4,6 +4,10 @@
=
link_to
admin_root_path
,
title:
'Overview'
do
=
link_to
admin_root_path
,
title:
'Overview'
do
%span
%span
Overview
Overview
=
nav_link
path:
'builds#index'
do
=
link_to
admin_builds_path
,
title:
'Builds'
do
%span
Builds
=
nav_link
(
controller:
[
:admin
,
:projects
])
do
=
nav_link
(
controller:
[
:admin
,
:projects
])
do
=
link_to
admin_namespaces_projects_path
,
title:
'Projects'
do
=
link_to
admin_namespaces_projects_path
,
title:
'Projects'
do
%span
%span
...
...
app/views/layouts/nav/_admin.html.haml
View file @
d3b6c185
%ul
.nav-links.scrolling-tabs
%ul
.nav-links.scrolling-tabs
.fade-left
.fade-left
=
nav_link
(
controller:
%w(dashboard admin projects users groups)
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
controller:
%w(dashboard admin projects users groups
builds
)
,
html_options:
{
class:
'home'
})
do
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'shortcuts-tree'
do
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'shortcuts-tree'
do
%span
%span
Overview
Overview
...
@@ -12,10 +12,6 @@
...
@@ -12,10 +12,6 @@
=
link_to
admin_runners_path
,
title:
'Runners'
do
=
link_to
admin_runners_path
,
title:
'Runners'
do
%span
%span
Runners
Runners
=
nav_link
path:
'builds#index'
do
=
link_to
admin_builds_path
,
title:
'Builds'
do
%span
Builds
=
nav_link
(
controller:
%w(background_jobs logs health_check)
)
do
=
nav_link
(
controller:
%w(background_jobs logs health_check)
)
do
=
link_to
admin_background_jobs_path
,
title:
'Monitoring'
do
=
link_to
admin_background_jobs_path
,
title:
'Monitoring'
do
%span
%span
...
...
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