diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /app/views/shared/runners/_shared_runners_description.html.haml | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
| download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/views/shared/runners/_shared_runners_description.html.haml')
| -rw-r--r-- | app/views/shared/runners/_shared_runners_description.html.haml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app/views/shared/runners/_shared_runners_description.html.haml b/app/views/shared/runners/_shared_runners_description.html.haml index 92564ec48bd..a276f725576 100644 --- a/app/views/shared/runners/_shared_runners_description.html.haml +++ b/app/views/shared/runners/_shared_runners_description.html.haml @@ -3,11 +3,9 @@ %h4 = _('Shared runners') -.bs-callout.shared-runners-description - = _('These runners are shared across this GitLab instance.') - %p +.bs-callout{ data: { testid: 'shared-runners-description' } } + %p= _('These runners are shared across this GitLab instance.') - if Gitlab::CurrentSettings.shared_runners_text.present? - = markdown_field(Gitlab::CurrentSettings.current_application_settings, :shared_runners_text) + = markdown(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 + %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 } |