diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-01 10:10:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-01 10:10:46 +0000 |
| commit | b569f842b37434efd0cbae4b0c197391e0610b12 (patch) | |
| tree | 88dc8867d3c995861870a93d9b619b356fdda088 /app/views | |
| parent | a647d55773b256a15a7c36732feace29285adf99 (diff) | |
| parent | 03dcb690451b254d02cb65b656c141d1c3161802 (diff) | |
| download | gitlab-ce-b569f842b37434efd0cbae4b0c197391e0610b12.tar.gz | |
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
See merge request !4961
Diffstat (limited to 'app/views')
| -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 114bea92fc2..a53876d6757 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 |