summaryrefslogtreecommitdiff
path: root/app/views/projects/runners
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-06-21 16:31:37 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-06-21 16:32:50 +0800
commitcdcbc8d7219a669c016aaba89a1d47faebdd2208 (patch)
tree318d7c9e05dd861976acc38c064d8f6047be4df2 /app/views/projects/runners
parentd611074edd9c9129852a386ebcec9cc7b2f99a3c (diff)
downloadgitlab-ce-cdcbc8d7219a669c016aaba89a1d47faebdd2208.tar.gz
Update wordings according to:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12594802
Diffstat (limited to 'app/views/projects/runners')
-rw-r--r--app/views/projects/runners/_form.html.haml4
-rw-r--r--app/views/projects/runners/_runner.html.haml2
-rw-r--r--app/views/projects/runners/show.html.haml2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml
index 0946e5e327a..c45a9d4f81f 100644
--- a/app/views/projects/runners/_form.html.haml
+++ b/app/views/projects/runners/_form.html.haml
@@ -13,11 +13,11 @@
= f.check_box :run_untagged
%span.light Indicates whether this runner can pick jobs without tags
.form-group
- = label :locked, 'Lock to this project', class: 'control-label'
+ = label :locked, 'Lock to current projects', class: 'control-label'
.col-sm-10
.checkbox
= f.check_box :locked
- %span.light When a runner is locked, it cannot be enabled for other projects
+ %span.light When a runner is locked, it cannot be assigned to other projects
.form-group
= label_tag :token, class: 'control-label' do
Token
diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml
index 3cf66bbcb4a..85225857758 100644
--- a/app/views/projects/runners/_runner.html.haml
+++ b/app/views/projects/runners/_runner.html.haml
@@ -5,7 +5,7 @@
- if @project_runners.include?(runner)
= link_to runner.short_sha, runner_path(runner)
- if runner.locked?
- = icon('lock', class: 'has-tooltip', title: 'Exclusive to this project')
+ = icon('lock', class: 'has-tooltip', title: 'Locked to current projects')
%small
= link_to edit_namespace_project_runner_path(@project.namespace, @project, runner) do
%i.fa.fa-edit.btn
diff --git a/app/views/projects/runners/show.html.haml b/app/views/projects/runners/show.html.haml
index fc6424402ae..61b99f35d74 100644
--- a/app/views/projects/runners/show.html.haml
+++ b/app/views/projects/runners/show.html.haml
@@ -23,7 +23,7 @@
%td Can run untagged jobs
%td= @runner.run_untagged? ? 'Yes' : 'No'
%tr
- %td Exclusive to this project
+ %td Locked to this project
%td= @runner.locked? ? 'Yes' : 'No'
%tr
%td Tags