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
fcf3b9d8
Unverified
Commit
fcf3b9d8
authored
Jun 16, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move admin->runners tab as subnav of overview tab
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
e11aae1a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
70 additions
and
64 deletions
+70
-64
_head.html.haml
app/views/admin/dashboard/_head.html.haml
+4
-0
index.html.haml
app/views/admin/runners/index.html.haml
+65
-59
_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+1
-5
No files found.
app/views/admin/dashboard/_head.html.haml
View file @
fcf3b9d8
...
@@ -20,3 +20,7 @@
...
@@ -20,3 +20,7 @@
=
link_to
admin_builds_path
,
title:
'Builds'
do
=
link_to
admin_builds_path
,
title:
'Builds'
do
%span
%span
Builds
Builds
=
nav_link
path:
[
'runners#index'
,
'runners#show'
]
do
=
link_to
admin_runners_path
,
title:
'Runners'
do
%span
Runners
app/views/admin/runners/index.html.haml
View file @
fcf3b9d8
%p
.lead.prepend-top-default
-
@no_container
=
true
%span
=
render
"admin/dashboard/head"
To register a new runner you should enter the following registration token.
With this token the runner will request a unique runner token and use that for future communication.
Registration token is
%code
{
id:
'runners-token'
}
#{
current_application_settings
.
runners_registration_token
}
.bs-callout.clearfix
%div
{
class:
(
container_class
)
}
.pull-left
%p
%p
.prepend-top-default
You can reset runners registration token by pressing a button below.
%span
%p
To register a new runner you should enter the following registration token.
=
button_to
reset_runners_token_admin_application_settings_path
,
With this token the runner will request a unique runner token and use that for future communication.
method: :put
,
class:
'btn btn-default'
,
%br
data:
{
confirm:
'Are you sure you want to reset registration token?'
}
do
Registration token is
=
icon
(
'refresh'
)
%code
{
id:
'runners-token'
}
#{
current_application_settings
.
runners_registration_token
}
Reset runners registration token
.bs-callout
.bs-callout.clearfix
%p
.pull-left
A 'runner' is a process which runs a build.
%p
You can setup as many runners as you need.
You can reset runners registration token by pressing a button below.
%br
%p
Runners can be placed on separate users, servers, and even on your local machine.
=
button_to
reset_runners_token_admin_application_settings_path
,
%br
method: :put
,
class:
'btn btn-default'
,
data:
{
confirm:
'Are you sure you want to reset registration token?'
}
do
=
icon
(
'refresh'
)
Reset runners registration token
.bs-callout
%p
A 'runner' is a process which runs a build.
You can setup as many runners as you need.
%br
Runners can be placed on separate users, servers, and even on your local machine.
%br
%div
%div
%span
Each runner can be in one of the following states:
%span
Each runner can be in one of the following states:
%ul
%ul
%li
%li
%span
.label.label-success
shared
%span
.label.label-success
shared
\- run builds from all unassigned projects
\- run builds from all unassigned projects
%li
%li
%span
.label.label-info
specific
%span
.label.label-info
specific
\- run builds from assigned projects
\- run builds from assigned projects
%li
%li
%span
.label.label-danger
paused
%span
.label.label-danger
paused
\- runner will not receive any new builds
\- runner will not receive any new builds
.append-bottom-20.clearfix
.append-bottom-20.clearfix
.pull-left
.pull-left
=
form_tag
admin_runners_path
,
id:
'runners-search'
,
class:
'form-inline'
,
method: :get
do
=
form_tag
admin_runners_path
,
id:
'runners-search'
,
class:
'form-inline'
,
method: :get
do
.form-group
.form-group
=
search_field_tag
:search
,
params
[
:search
],
class:
'form-control'
,
placeholder:
'Runner description or token'
,
spellcheck:
false
=
search_field_tag
:search
,
params
[
:search
],
class:
'form-control'
,
placeholder:
'Runner description or token'
,
spellcheck:
false
=
submit_tag
'Search'
,
class:
'btn'
=
submit_tag
'Search'
,
class:
'btn'
.pull-right.light
.pull-right.light
Runners with last contact less than a minute ago:
#{
@active_runners_cnt
}
Runners with last contact less than a minute ago:
#{
@active_runners_cnt
}
%br
%br
.table-holder
.table-holder
%table
.table
%table
.table
%thead
%thead
%tr
%tr
%th
Type
%th
Type
%th
Runner token
%th
Runner token
%th
Description
%th
Description
%th
Projects
%th
Projects
%th
Builds
%th
Builds
%th
Tags
%th
Tags
%th
Last contact
%th
Last contact
%th
%th
-
@runners
.
each
do
|
runner
|
-
@runners
.
each
do
|
runner
|
=
render
"admin/runners/runner"
,
runner:
runner
=
render
"admin/runners/runner"
,
runner:
runner
=
paginate
@runners
=
paginate
@runners
app/views/layouts/nav/_admin.html.haml
View file @
fcf3b9d8
%ul
.nav-links.scrolling-tabs
%ul
.nav-links.scrolling-tabs
.fade-left
.fade-left
=
nav_link
(
controller:
%w(dashboard admin projects users groups builds)
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
controller:
%w(dashboard admin projects users groups builds
runners
)
,
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_deploy_keys_path
,
title:
'Deploy Keys'
do
=
link_to
admin_deploy_keys_path
,
title:
'Deploy Keys'
do
%span
%span
Deploy Keys
Deploy Keys
=
nav_link
path:
[
'runners#index'
,
'runners#show'
]
do
=
link_to
admin_runners_path
,
title:
'Runners'
do
%span
Runners
=
nav_link
(
controller: :broadcast_messages
)
do
=
nav_link
(
controller: :broadcast_messages
)
do
=
link_to
admin_broadcast_messages_path
,
title:
'Messages'
do
=
link_to
admin_broadcast_messages_path
,
title:
'Messages'
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