diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 06:09:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 06:09:11 +0300 |
| commit | 82013498a3be9fb17ed05c7dcf67df84fa83fb2f (patch) | |
| tree | 18396f4053d3254e4034db18b5841a6c90b34661 /app/assets/javascripts/runner | |
| parent | c72cf9fe6a4c390e8a7323ea9a950808ee4f09fd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/runner')
| -rw-r--r-- | app/assets/javascripts/runner/components/runner_details.vue | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/runner/components/runner_details.vue b/app/assets/javascripts/runner/components/runner_details.vue index 75ddec6c716..3c03804a79f 100644 --- a/app/assets/javascripts/runner/components/runner_details.vue +++ b/app/assets/javascripts/runner/components/runner_details.vue @@ -19,6 +19,10 @@ export default { import('ee_component/runner/components/runner_maintenance_note_detail.vue'), RunnerGroups, RunnerProjects, + RunnerUpgradeStatusBadge: () => + import('ee_component/runner/components/runner_upgrade_status_badge.vue'), + RunnerUpgradeStatusAlert: () => + import('ee_component/runner/components/runner_upgrade_status_alert.vue'), RunnerTags, TimeAgo, }, @@ -66,6 +70,7 @@ export default { <template #title>{{ s__('Runners|Details') }}</template> <template v-if="runner"> + <runner-upgrade-status-alert class="gl-my-4" :runner="runner" /> <div class="gl-pt-4"> <dl class="gl-mb-0" data-testid="runner-details-list"> <runner-detail :label="s__('Runners|Description')" :value="runner.description" /> @@ -77,7 +82,12 @@ export default { <time-ago v-if="runner.contactedAt" :time="runner.contactedAt" /> </template> </runner-detail> - <runner-detail :label="s__('Runners|Version')" :value="runner.version" /> + <runner-detail :label="s__('Runners|Version')"> + <template v-if="runner.version" #value> + {{ runner.version }} + <runner-upgrade-status-badge size="sm" :runner="runner" /> + </template> + </runner-detail> <runner-detail :label="s__('Runners|IP Address')" :value="runner.ipAddress" /> <runner-detail :label="s__('Runners|Executor')" :value="runner.executorName" /> <runner-detail :label="s__('Runners|Architecture')" :value="runner.architectureName" /> |