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 | |
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')
-rw-r--r-- | app/views/shared/runners/_runner_details.html.haml (renamed from app/views/shared/runners/show.html.haml) | 39 | ||||
-rw-r--r-- | app/views/shared/runners/_shared_runners_description.html.haml | 10 |
2 files changed, 24 insertions, 25 deletions
diff --git a/app/views/shared/runners/show.html.haml b/app/views/shared/runners/_runner_details.html.haml index 757ec870f79..672f0b6a83f 100644 --- a/app/views/shared/runners/show.html.haml +++ b/app/views/shared/runners/_runner_details.html.haml @@ -1,8 +1,9 @@ -- page_title "#{@runner.description} ##{@runner.id}", _("Runners") +- breadcrumb_title runner.short_sha +- page_title "##{runner.id} (#{runner.short_sha})" %h2.page-title - = s_('Runners|Runner #%{runner_id}' % { runner_id: @runner.id }) - = render 'shared/runners/runner_type_badge', runner: @runner + = s_('Runners|Runner #%{runner_id}' % { runner_id: runner.id }) + = render 'shared/runners/runner_type_badge', runner: runner .table-holder %table.table @@ -12,51 +13,51 @@ %th= s_('Runners|Value') %tr %td= s_('Runners|Active') - %td= @runner.active? ? _('Yes') : _('No') + %td= runner.active? ? _('Yes') : _('No') %tr %td= s_('Runners|Protected') - %td= @runner.ref_protected? ? _('Yes') : _('No') + %td= runner.ref_protected? ? _('Yes') : _('No') %tr %td= s_('Runners|Can run untagged jobs') - %td= @runner.run_untagged? ? _('Yes') : _('No') - - unless @runner.group_type? + %td= runner.run_untagged? ? _('Yes') : _('No') + - unless runner.group_type? %tr %td= s_('Runners|Locked to this project') - %td= @runner.locked? ? _('Yes') : _('No') + %td= runner.locked? ? _('Yes') : _('No') %tr %td= s_('Runners|Tags') %td - - @runner.tag_list.sort.each do |tag| + - runner.tag_list.sort.each do |tag| %span.badge.badge-primary = tag %tr %td= s_('Runners|Name') - %td= @runner.name + %td= runner.name %tr %td= s_('Runners|Version') - %td= @runner.version + %td= runner.version %tr %td= s_('Runners|IP Address') - %td= @runner.ip_address + %td= runner.ip_address %tr %td= s_('Runners|Revision') - %td= @runner.revision + %td= runner.revision %tr %td= s_('Runners|Platform') - %td= @runner.platform + %td= runner.platform %tr %td= s_('Runners|Architecture') - %td= @runner.architecture + %td= runner.architecture %tr %td= s_('Runners|Description') - %td= @runner.description + %td= runner.description %tr %td= s_('Runners|Maximum job timeout') - %td= @runner.maximum_timeout_human_readable + %td= runner.maximum_timeout_human_readable %tr %td= s_('Runners|Last contact') %td - - if @runner.contacted_at - = time_ago_with_tooltip @runner.contacted_at + - if runner.contacted_at + = time_ago_with_tooltip runner.contacted_at - else = s_('Never') 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 } |