diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/views/shared/runners | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/views/shared/runners')
| -rw-r--r-- | app/views/shared/runners/_runner_type_alert.html.haml | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/app/views/shared/runners/_runner_type_alert.html.haml b/app/views/shared/runners/_runner_type_alert.html.haml index e0cc1e924d8..365cee5fadc 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 Pajamas::AlertComponent.new(alert_class: alert_class, + title: s_('Runners|This runner is available to all projects and subgroups in a group.'), + dismissible: false) 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 Pajamas::AlertComponent.new(alert_class: alert_class, + title: s_('Runners|This runner is associated with specific projects.'), + dismissible: false) 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' |