Add latest changes from gitlab-org/gitlab@14-8-stable-ee

3 files changed, 22 insertions, 13 deletions

diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue
index 52da4d01468..7c78abae77f 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue
@@ -136,8 +136,8 @@ export default {
           return __('Branch');
       }
     },
-    commitTitleText() {
-      return this.pipeline?.commit?.title || __("Can't find HEAD commit for this branch");
+    commitTitle() {
+      return this.pipeline?.commit?.title;
     },
     hasAuthor() {
       return (
@@ -159,22 +159,27 @@ export default {
   <div class="pipeline-tags" data-testid="pipeline-url-table-cell">
     <template v-if="rearrangePipelinesTable">
       <div class="commit-title gl-mb-2" data-testid="commit-title-container">
-        <span class="gl-display-flex">
-          <tooltip-on-truncate :title="commitTitleText" class="flex-truncate-child gl-flex-grow-1">
+        <span v-if="commitTitle" class="gl-display-flex">
+          <tooltip-on-truncate :title="commitTitle" class="flex-truncate-child gl-flex-grow-1">
             <gl-link
-              :href="pipeline.path"
-              class="commit-row-message gl-text-blue-600!"
+              :href="commitUrl"
+              class="commit-row-message gl-text-gray-900"
               data-testid="commit-title"
-              data-qa-selector="pipeline_url_link"
-              >{{ commitTitleText }}</gl-link
+              >{{ commitTitle }}</gl-link
             >
           </tooltip-on-truncate>
         </span>
+        <span v-else>{{ __("Can't find HEAD commit for this branch") }}</span>
       </div>
       <div class="gl-mb-2">
-        <span class="gl-font-weight-bold gl-text-gray-500" data-testid="pipeline-identifier">
+        <gl-link
+          :href="pipeline.path"
+          class="gl-text-decoration-underline gl-text-blue-600!"
+          data-testid="pipeline-url-link"
+          data-qa-selector="pipeline_url_link"
+        >
           #{{ pipeline[pipelineKey] }}
-        </span>
+        </gl-link>
         <!--Commit row-->
         <div class="icon-container gl-display-inline-block">
           <gl-icon
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue
index e2b6579a841..3b99afa9e3d 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/header.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue
@@ -171,8 +171,12 @@ export default {
         @click="previewMarkdownTab($event)"
       />
 
-      <template v-if="!previewMarkdown" #tabs-end>
-        <div class="md-header-toolbar gl-ml-auto gl-pb-3 gl-justify-content-center">
+      <template #tabs-end>
+        <div
+          data-testid="md-header-toolbar"
+          :class="{ 'gl-display-none': previewMarkdown }"
+          class="md-header-toolbar gl-ml-auto gl-pb-3 gl-justify-content-center"
+        >
           <toolbar-button
             tag="**"
             :button-title="
diff --git a/app/services/quick_actions/interpret_service.rb b/app/services/quick_actions/interpret_service.rb
index 906c4b98f56..1baa4ddf0eb 100644
--- a/app/services/quick_actions/interpret_service.rb
+++ b/app/services/quick_actions/interpret_service.rb
@@ -79,7 +79,7 @@ module QuickActions
       # using a user-style reference, which is not in scope here.
       args        = params.split(/\s|,/).select(&:present?).uniq - ['and']
       usernames   = (args - ['me']).map { _1.delete_prefix('@') }
-      found       = User.by_username(usernames).to_a.select { can?(:read_user_profile, _1) }
+      found       = User.by_username(usernames).to_a.select { can?(:read_user, _1) }
       found_names = found.map(&:username).to_set
       missing     = args.reject { |arg| arg == 'me' || found_names.include?(arg.delete_prefix('@')) }.map { "'#{_1}'" }