summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2018-04-06 12:16:29 +1000
committerDylan Griffith <dyl.griffith@gmail.com>2018-04-06 12:16:29 +1000
commit65588fb7448bebb51c7ce574e2bf0df42a558276 (patch)
tree72cd6db8ab5370ddfa0a10925dbf36aef3ce97a9
parent582beb79cd612f38d186e32e952a62c635ceacbb (diff)
downloadgitlab-ce-65588fb7448bebb51c7ce574e2bf0df42a558276.tar.gz
Copy changes around registering runners (#10244)
-rw-r--r--app/views/projects/runners/_group_runners.html.haml2
-rw-r--r--app/views/projects/runners/_shared_runners.html.haml4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/runners/_group_runners.html.haml b/app/views/projects/runners/_group_runners.html.haml
index 514f98f0a06..96384af13bf 100644
--- a/app/views/projects/runners/_group_runners.html.haml
+++ b/app/views/projects/runners/_group_runners.html.haml
@@ -21,7 +21,7 @@
This group does not provide any group Runners yet.
- if can?(current_user, :admin_pipeline, @project.group)
- You can register group runners in the
+ Group masters can register group runners in the
= link_to 'Group CI/CD settings', group_settings_ci_cd_path(@project.group)
- else
Ask your group master to setup a group Runner.
diff --git a/app/views/projects/runners/_shared_runners.html.haml b/app/views/projects/runners/_shared_runners.html.haml
index 4fd4ca355a8..969efdb2560 100644
--- a/app/views/projects/runners/_shared_runners.html.haml
+++ b/app/views/projects/runners/_shared_runners.html.haml
@@ -17,8 +17,8 @@
&nbsp; for this project
- if @shared_runners_count.zero?
- This GitLab server does not provide any shared Runners yet.
- Please use the specific Runners or ask your administrator to create one.
+ This GitLab instance does not provide any shared Runners yet. Instance
+ administrators can register shared Runners in the admin area.
- else
%h4.underlined-title Available shared Runners : #{@shared_runners_count}
%ul.bordered-list.available-shared-runners