diff options
Diffstat (limited to 'app/views/shared/runners')
| -rw-r--r-- | app/views/shared/runners/_runner_description.html.haml | 12 | ||||
| -rw-r--r-- | app/views/shared/runners/_shared_runners_description.html.haml | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/app/views/shared/runners/_runner_description.html.haml b/app/views/shared/runners/_runner_description.html.haml index 436dbfd2b49..dc689303f77 100644 --- a/app/views/shared/runners/_runner_description.html.haml +++ b/app/views/shared/runners/_runner_description.html.haml @@ -1,6 +1,12 @@ .light.gl-mt-3 %p - = _("Register as many runners as you want. You can register runners as separate users, on separate servers, and on your local machine. Runners are either:") + = s_("Runners|Register as many runners as you want. You can register runners as separate users, on separate servers, and on your local machine.") + + %h5 + = s_("Runners|How do runners pick up jobs?") + + %p + = s_("Runners|Runners are either:") %div %ul @@ -10,3 +16,7 @@ %li = gl_badge_tag s_("Runners|paused"), variant: :danger, size: :sm = _('- Not available to run jobs.') + + %p + = s_("Runners|Tags control which type of jobs a runner can handle. By tagging a runner, you make sure shared runners only handle the jobs they are equipped to run.") + = link_to _("Learn more."), help_page_path("ci/runners/configure_runners", anchor: "use-tags-to-control-which-jobs-a-runner-can-run"), target: '_blank' diff --git a/app/views/shared/runners/_shared_runners_description.html.haml b/app/views/shared/runners/_shared_runners_description.html.haml index 2779901ca0c..c8ddb5d5176 100644 --- a/app/views/shared/runners/_shared_runners_description.html.haml +++ b/app/views/shared/runners/_shared_runners_description.html.haml @@ -1,12 +1,9 @@ --# "MaxBuilds" is a runner configuration keyword so it must not be translated. -- link = link_to 'MaxBuilds', 'https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnersmachine-section', target: '_blank', rel: 'noopener noreferrer' +- shared_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('ci/runners/runners_scope.md', anchor: 'shared-runners') } %h4 = _('Shared runners') .bs-callout{ data: { testid: 'shared-runners-description' } } - %p= _('These runners are shared across this GitLab instance.') + %p= s_('Runners|%{link_start}These runners%{link_end} are available to all groups and projects.').html_safe % { link_start: shared_link_start, link_end: '</a>'.html_safe } - if Gitlab::CurrentSettings.shared_runners_text.present? = markdown(Gitlab::CurrentSettings.current_application_settings.shared_runners_text) - - else - %p= _('The same shared runner executes code from multiple projects, unless you configure autoscaling with %{link} set to 1 (which it is on GitLab.com).').html_safe % { link: link } |