Add latest changes from gitlab-org/gitlab@master

2 files changed, 23 insertions, 9 deletions

diff --git a/app/assets/javascripts/clusters/agents/components/activity_events_list.vue b/app/assets/javascripts/clusters/agents/components/activity_events_list.vue
index 146b647cb46..6567ce203bc 100644
--- a/app/assets/javascripts/clusters/agents/components/activity_events_list.vue
+++ b/app/assets/javascripts/clusters/agents/components/activity_events_list.vue
@@ -1,5 +1,12 @@
 <script>
-import { GlLoadingIcon, GlEmptyState, GlLink, GlIcon, GlAlert } from '@gitlab/ui';
+import {
+  GlLoadingIcon,
+  GlEmptyState,
+  GlLink,
+  GlIcon,
+  GlAlert,
+  GlTooltipDirective,
+} from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import { n__, s__, __ } from '~/locale';
 import { formatDate, getDayDifference, isToday } from '~/lib/utils/datetime_utility';
@@ -16,10 +23,14 @@ export default {
     GlIcon,
     ActivityHistoryItem,
   },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
   i18n: {
     emptyText: s__(
       'ClusterAgents|See Agent activity updates such as tokens created or revoked and clusters connected or not connected.',
     ),
+    emptyTooltip: s__('ClusterAgents|What is GitLab Agent activity?'),
     error: s__(
       'ClusterAgents|An error occurred while retrieving GitLab Agent activity. Reload the page to try again.',
     ),
@@ -150,12 +161,15 @@ export default {
       :svg-path="activityEmptyStateImage"
       :svg-height="150"
     >
-      <template #description>
-        <div>
-          <span>{{ $options.i18n.emptyText }}</span>
-
-          <gl-link :href="$options.emptyHelpLink"><gl-icon name="question" :size="14" /></gl-link>
-        </div>
+      <template #description
+        >{{ $options.i18n.emptyText }}
+        <gl-link
+          v-gl-tooltip
+          :href="$options.emptyHelpLink"
+          :title="$options.i18n.emptyTooltip"
+          :aria-label="$options.i18n.emptyTooltip"
+          ><gl-icon name="question" :size="14"
+        /></gl-link>
       </template>
     </gl-empty-state>
   </div>
diff --git a/app/assets/javascripts/clusters/agents/components/activity_history_item.vue b/app/assets/javascripts/clusters/agents/components/activity_history_item.vue
index 39389c3b04b..7792d89a575 100644
--- a/app/assets/javascripts/clusters/agents/components/activity_history_item.vue
+++ b/app/assets/javascripts/clusters/agents/components/activity_history_item.vue
@@ -64,12 +64,12 @@ export default {
       <p class="gl-mt-2 gl-mb-0 gl-pb-2" :class="bodyClass">
         <gl-sprintf :message="eventDetails.body">
           <template #userName>
-            <strong>{{ eventDetails.user.name }}</strong>
+            <span class="gl-font-weight-bold">{{ eventDetails.user.name }}</span>
             <gl-link :href="eventDetails.user.webUrl">@{{ eventDetails.user.username }}</gl-link>
           </template>
 
           <template #strong="{ content }">
-            <strong> {{ content }} </strong>
+            <span class="gl-font-weight-bold"> {{ content }} </span>
           </template>
         </gl-sprintf>
         <time-ago-tooltip :time="eventDetails.recordedAt" />