diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-01 13:10:46 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-06 19:39:03 +0300 |
commit | 2a7ea3417310d450cc21a07f7d61b822d3da9011 (patch) | |
tree | ec1a8895ca9135a2beffe9442fe2cb41fe8b5a8d /app/views/admin | |
parent | 71212ecea6aee0365c336a596fbb3f593dfaf4ab (diff) |
Merge branch 'enable-shared-runners-with-admins' into 'master'
Admin should be able to turn shared runners into specific ones:
## What does this MR do?
Make sure admins could turn shared runners into specific runners.
## Are there points in the code the reviewer needs to double check?
Is this the desired behaviour?
## Why was this MR needed?
Closes #19039
Closes #19272
![Screen_Shot_2016-06-30_at_9.30.05_PM](/uploads/97eb3b4923fd4e498b1f8ca70b1345c8/Screen_Shot_2016-06-30_at_9.30.05_PM.png)
See merge request !4961
(cherry picked from commit b569f842b37434efd0cbae4b0c197391e0610b12)
Diffstat (limited to 'app/views/admin')
-rw-r--r-- | app/views/admin/runners/_runner.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/runners/index.html.haml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index 36b21eefdee..64893b38c58 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -4,6 +4,8 @@ %span.label.label-success shared - else %span.label.label-info specific + - if runner.locked? + %span.label.label-warning locked - unless runner.active? %span.label.label-danger paused diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index 5eff77aff2d..b5c6b5effe3 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -40,6 +40,9 @@ %span.label.label-info specific \- run builds from assigned projects %li + %span.label.label-warning locked + \- runner cannot be assigned to other projects + %li %span.label.label-danger paused \- runner will not receive any new builds |