diff --git a/app/views/shared/runners/_runner_type_alert.html.haml b/app/views/shared/runners/_runner_type_alert.html.haml index e0cc1e924d893a636b3905816e8a01de08657d1f..5637e08b59ec503aad8a877114187971019422d2 100644 --- a/app/views/shared/runners/_runner_type_alert.html.haml +++ b/app/views/shared/runners/_runner_type_alert.html.haml @@ -1,20 +1,16 @@ -.gl-alert.gl-alert-info.gl-my-5 - = sprite_icon('information-o', css_class: 'gl-alert-icon') - - if runner.instance_type? - %h4.gl-alert-title - = s_('Runners|This runner is available to all groups and projects in your GitLab instance.') - .gl-alert-body - = s_('Runners|Shared runners are available to every project in a GitLab instance. If you want a runner to build only specific projects, restrict the project in the table below. After you restrict a runner to a project, you cannot change it back to a shared runner.') - = link_to _('Learn more.'), help_page_path('ci/runners/runners_scope', anchor: 'shared-runners'), target: '_blank', rel: 'noopener noreferrer' - - elsif runner.group_type? - %h4.gl-alert-title - = s_('Runners|This runner is available to all projects and subgroups in a group.') +- alert_class = 'gl-mb-5' + +- if runner.group_type? + = render 'shared/global_alert', + alert_class: alert_class, + title: s_('Runners|This runner is available to all projects and subgroups in a group.') do .gl-alert-body = s_('Runners|Use Group runners when you want all projects in a group to have access to a set of runners.') = link_to _('Learn more.'), help_page_path('ci/runners/runners_scope', anchor: 'group-runners'), target: '_blank', rel: 'noopener noreferrer' - - else - %h4.gl-alert-title - = s_('Runners|This runner is associated with specific projects.') +- else + = render 'shared/global_alert', + alert_class: alert_class, + title: s_('Runners|This runner is associated with specific projects.') do .gl-alert-body = s_('Runners|You can set up a specific runner to be used by multiple projects but you cannot make this a shared runner.') = link_to _('Learn more.'), help_page_path('ci/runners/runners_scope', anchor: 'specific-runners'), target: '_blank', rel: 'noopener noreferrer' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index c71c614ebda11f32704d0b68c2800bd4ff9591d4..ee0f78f6c0a3dd1af968ff06a50ffdeb97656d5d 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -32183,9 +32183,6 @@ msgstr "" msgid "Runners|Select your preferred option here. In the next step, you can choose the capacity for your runner in the AWS CloudFormation console." msgstr "" -msgid "Runners|Shared runners are available to every project in a GitLab instance. If you want a runner to build only specific projects, restrict the project in the table below. After you restrict a runner to a project, you cannot change it back to a shared runner." -msgstr "" - msgid "Runners|Show runner installation and registration instructions" msgstr "" @@ -32228,9 +32225,6 @@ msgstr "" msgid "Runners|This runner is associated with specific projects." msgstr "" -msgid "Runners|This runner is available to all groups and projects in your GitLab instance." -msgstr "" - msgid "Runners|This runner is available to all projects and subgroups in a group." msgstr ""