Add latest changes from gitlab-org/gitlab@master

3 files changed, 32 insertions, 3 deletions

diff --git a/app/assets/javascripts/runner/components/runner_assigned_item.vue b/app/assets/javascripts/runner/components/runner_assigned_item.vue
index 38bdfecb7df..2fa87bdd776 100644
--- a/app/assets/javascripts/runner/components/runner_assigned_item.vue
+++ b/app/assets/javascripts/runner/components/runner_assigned_item.vue
@@ -1,10 +1,11 @@
 <script>
-import { GlAvatar, GlLink } from '@gitlab/ui';
+import { GlAvatar, GlBadge, GlLink } from '@gitlab/ui';
 import { AVATAR_SHAPE_OPTION_RECT } from '~/vue_shared/constants';
 
 export default {
   components: {
     GlAvatar,
+    GlBadge,
     GlLink,
   },
   props: {
@@ -25,6 +26,16 @@ export default {
       required: false,
       default: null,
     },
+    description: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    isOwner: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   AVATAR_SHAPE_OPTION_RECT,
 };
@@ -41,7 +52,12 @@ export default {
         :size="48"
       />
     </gl-link>
-
-    <gl-link :href="href" class="gl-font-weight-bold gl-text-gray-900!">{{ fullName }}</gl-link>
+    <div>
+      <div class="gl-mb-1">
+        <gl-link :href="href" class="gl-font-weight-bold gl-text-gray-900!">{{ fullName }}</gl-link>
+        <gl-badge v-if="isOwner" variant="info">{{ s__('Runner|Owner') }}</gl-badge>
+      </div>
+      <div v-if="description">{{ description }}</div>
+    </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/runner/components/runner_projects.vue b/app/assets/javascripts/runner/components/runner_projects.vue
index c0c0c14e91e..0a435f06792 100644
--- a/app/assets/javascripts/runner/components/runner_projects.vue
+++ b/app/assets/javascripts/runner/components/runner_projects.vue
@@ -30,6 +30,7 @@ export default {
   data() {
     return {
       projects: {
+        ownerProjectId: null,
         items: [],
         pageInfo: {},
         count: 0,
@@ -48,6 +49,7 @@ export default {
       update(data) {
         const { runner } = data;
         return {
+          ownerProjectId: runner?.ownerProject?.id,
           count: runner?.projectCount || 0,
           items: runner?.projects?.nodes || [],
           pageInfo: runner?.projects?.pageInfo || {},
@@ -76,6 +78,11 @@ export default {
       });
     },
   },
+  methods: {
+    isOwner(projectId) {
+      return projectId === this.projects.ownerProjectId;
+    },
+  },
   I18N_NONE,
 };
 </script>
@@ -98,6 +105,8 @@ export default {
         :name="project.name"
         :full-name="project.nameWithNamespace"
         :avatar-url="project.avatarUrl"
+        :description="project.description"
+        :is-owner="isOwner(project.id)"
       />
     </template>
     <span v-else class="gl-text-gray-500">{{ $options.I18N_NONE }}</span>
diff --git a/app/assets/javascripts/runner/graphql/show/runner_projects.query.graphql b/app/assets/javascripts/runner/graphql/show/runner_projects.query.graphql
index cb27de7c200..acc4a641565 100644
--- a/app/assets/javascripts/runner/graphql/show/runner_projects.query.graphql
+++ b/app/assets/javascripts/runner/graphql/show/runner_projects.query.graphql
@@ -9,11 +9,15 @@ query getRunnerProjects(
 ) {
   runner(id: $id) {
     id
+    ownerProject {
+      id
+    }
     projectCount
     projects(first: $first, last: $last, before: $before, after: $after) {
       nodes {
         id
         avatarUrl
+        description
         name
         nameWithNamespace
         webUrl