Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 9 deletions

diff --git a/app/assets/javascripts/runner/components/cells/runner_summary_cell.vue b/app/assets/javascripts/runner/components/cells/runner_summary_cell.vue
index 1cd098d6713..971379ee570 100644
--- a/app/assets/javascripts/runner/components/cells/runner_summary_cell.vue
+++ b/app/assets/javascripts/runner/components/cells/runner_summary_cell.vue
@@ -3,6 +3,7 @@ import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
 
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue';
 import RunnerName from '../runner_name.vue';
+import RunnerTags from '../runner_tags.vue';
 import RunnerTypeBadge from '../runner_type_badge.vue';
 
 import { I18N_LOCKED_RUNNER_DESCRIPTION } from '../../constants';
@@ -12,6 +13,7 @@ export default {
     GlIcon,
     TooltipOnTruncate,
     RunnerName,
+    RunnerTags,
     RunnerTypeBadge,
   },
   directives: {
@@ -67,5 +69,6 @@ export default {
       <span class="gl-md-display-none gl-lg-display-inline">{{ __('IP Address') }}</span>
       <strong>{{ ipAddress }}</strong>
     </tooltip-on-truncate>
+    <runner-tags class="gl-display-block gl-mt-2" :tag-list="runner.tagList" size="sm" />
   </div>
 </template>
diff --git a/app/assets/javascripts/runner/components/runner_list.vue b/app/assets/javascripts/runner/components/runner_list.vue
index 2e406f71792..708375b0426 100644
--- a/app/assets/javascripts/runner/components/runner_list.vue
+++ b/app/assets/javascripts/runner/components/runner_list.vue
@@ -9,14 +9,12 @@ import { formatJobCount, tableField } from '../utils';
 import RunnerSummaryCell from './cells/runner_summary_cell.vue';
 import RunnerStatusPopover from './runner_status_popover.vue';
 import RunnerStatusCell from './cells/runner_status_cell.vue';
-import RunnerTags from './runner_tags.vue';
 
 const defaultFields = [
   tableField({ key: 'status', label: s__('Runners|Status'), thClasses: ['gl-w-15p'] }),
-  tableField({ key: 'summary', label: s__('Runners|Runner'), thClasses: ['gl-lg-w-25p'] }),
+  tableField({ key: 'summary', label: s__('Runners|Runner'), thClasses: ['gl-lg-w-40p'] }),
   tableField({ key: 'version', label: __('Version') }),
   tableField({ key: 'jobCount', label: __('Jobs') }),
-  tableField({ key: 'tagList', label: __('Tags'), thClasses: ['gl-lg-w-25p'] }),
   tableField({ key: 'contactedAt', label: __('Last contact') }),
   tableField({ key: 'actions', label: '' }),
 ];
@@ -30,7 +28,6 @@ export default {
     TimeAgo,
     RunnerStatusPopover,
     RunnerSummaryCell,
-    RunnerTags,
     RunnerStatusCell,
   },
   directives: {
@@ -158,10 +155,6 @@ export default {
         {{ formatJobCount(jobCount) }}
       </template>
 
-      <template #cell(tagList)="{ item: { tagList } }">
-        <runner-tags :tag-list="tagList" size="sm" />
-      </template>
-
       <template #cell(contactedAt)="{ item: { contactedAt } }">
         <time-ago v-if="contactedAt" :time="contactedAt" />
         <template v-else>{{ __('Never') }}</template>
diff --git a/app/assets/javascripts/runner/components/runner_tags.vue b/app/assets/javascripts/runner/components/runner_tags.vue
index 797d2a35b2c..38e566f9f53 100644
--- a/app/assets/javascripts/runner/components/runner_tags.vue
+++ b/app/assets/javascripts/runner/components/runner_tags.vue
@@ -20,7 +20,7 @@ export default {
 };
 </script>
 <template>
-  <span>
+  <span v-if="tagList && tagList.length">
     <runner-tag
       v-for="tag in tagList"
       :key="tag"