diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /app/views/admin/runners/show.html.haml | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'app/views/admin/runners/show.html.haml')
-rw-r--r-- | app/views/admin/runners/show.html.haml | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml index aca50de3852..705716c09b7 100644 --- a/app/views/admin/runners/show.html.haml +++ b/app/views/admin/runners/show.html.haml @@ -1,34 +1,17 @@ - add_page_specific_style 'page_bundles/ci_status' -= content_for :title do - %h3.project-title - Runner ##{@runner.id} - .float-right - - if @runner.instance_type? - %span.runner-state.runner-state-shared - Shared - - else - %span.runner-state.runner-state-specific - Specific - - page_title @runner.short_sha -- add_to_breadcrumbs _("Runners"), admin_runners_path -- breadcrumb_title "##{@runner.id}" +- add_to_breadcrumbs _('Runners'), admin_runners_path +- breadcrumb_title page_title -- if @runner.instance_type? - .bs-callout.bs-callout-success - %h4= _('This runner processes jobs for all unassigned projects.') - %p - = _('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.') -- elsif @runner.group_type? - .bs-callout.bs-callout-success - %h4= _('This runner processes jobs for all projects in its group and subgroups.') +- if Feature.enabled?(:runner_detailed_view_vue_ui, current_user, default_enabled: :yaml) + #js-runner-detail{ data: {runner_id: @runner.id} } - else - .bs-callout.bs-callout-info - %h4= _('This runner processes jobs for assigned projects only.') - %p - = _('You cannot make this a shared runner.') -%hr + %h2.page-title + = s_('Runners|Runner #%{runner_id}' % { runner_id: @runner.id }) + = render 'shared/runners/runner_type_badge', runner: @runner + += render 'shared/runners/runner_type_alert', runner: @runner .gl-mb-6 = render 'shared/runners/form', runner: @runner, runner_form_url: admin_runner_path(@runner), in_gitlab_com_admin_context: Gitlab.com? @@ -37,7 +20,7 @@ .col-md-6 %h4= _('Restrict projects for this runner') - if @runner.projects.any? - %table.table.assigned-projects + %table.table{ data: { testid: 'assigned-projects' } } %thead %tr %th= _('Assigned projects') @@ -54,7 +37,7 @@ .gl-alert-actions = link_to s_('Disable'), admin_namespace_project_runner_project_path(project.namespace, project, runner_project), method: :delete, class: 'btn gl-alert-action btn-info btn-md gl-button' - %table.table.unassigned-projects + %table.table{ data: { testid: 'unassigned-projects' } } %thead %tr %th= _('Project') |