summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-05-15 14:13:59 +0000
committerValery Sizov <valery@gitlab.com>2015-05-15 14:13:59 +0000
commit133706525871ee68af978d6aadc18f85b68edfaf (patch)
treedd257d5abb7dc14243b9fc277121a2b35ee2df9d
parent5a5b791188dbb1e3a56e858d81ed9857bb0974ca (diff)
parent66c6b19e28ad69772ce0328013307aa4209420d8 (diff)
downloadgitlab-ci-133706525871ee68af978d6aadc18f85b68edfaf.tar.gz
Merge branch 'improve-admin-runner-page' into 'master'
Specific runner can not be marked as shared again https://dev.gitlab.org/gitlab/gitlab-ci/issues/195 See merge request !105
-rw-r--r--app/views/admin/runners/show.html.haml6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index a99bd2e..5062400 100644
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -14,11 +14,13 @@
- if @runner.shared?
.bs-callout.bs-callout-success
%h4 This runner will process build from ALL UNASSIGNED projects
- %p If you want runner to build only specific projects you just need to enable them in table below
+ %p
+ If you want runners to build only specific projects, enable them in the table below.
+ Keep in mind that this is a one way transition.
- else
.bs-callout.bs-callout-info
%h4 This runner will process build only from ASSIGNED projects
- %p If you want runner to build unassigned projects you just need to disable all assignee projects
+ %p You can't make this a shared runner.
%hr
= form_for @runner, url: admin_runner_path(@runner), html: { class: 'form-horizontal' } do |f|
.form-group