From 48aff82709769b098321c738f3444b9bdaa694c6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 21 Oct 2020 07:08:36 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-5-stable-ee --- .../shared/runners/_shared_runners_description.html.haml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 app/views/shared/runners/_shared_runners_description.html.haml (limited to 'app/views/shared/runners') diff --git a/app/views/shared/runners/_shared_runners_description.html.haml b/app/views/shared/runners/_shared_runners_description.html.haml new file mode 100644 index 00000000000..b9fb518b1aa --- /dev/null +++ b/app/views/shared/runners/_shared_runners_description.html.haml @@ -0,0 +1,11 @@ +- link = link_to _('MaxBuilds'), 'https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnersmachine-section', target: '_blank' + +%h3 + = _('Shared runners') + +.bs-callout.shared-runners-description + - if Gitlab::CurrentSettings.shared_runners_text.present? + = markdown_field(Gitlab::CurrentSettings.current_application_settings, :shared_runners_text) + - else + = _('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 } + = yield -- cgit v1.2.3