Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 8 deletions

diff --git a/app/assets/javascripts/pipelines/components/performance_insights_modal.vue b/app/assets/javascripts/pipelines/components/performance_insights_modal.vue
index ae6b9186930..fdbf0ca19bc 100644
--- a/app/assets/javascripts/pipelines/components/performance_insights_modal.vue
+++ b/app/assets/javascripts/pipelines/components/performance_insights_modal.vue
@@ -97,13 +97,16 @@ export default {
     <gl-loading-icon v-if="$apollo.queries.jobs.loading" size="lg" />
 
     <template v-else>
-      <gl-alert v-if="showLimitMessage" class="gl-mb-4" :dismissible="false">
-        <p>{{ $options.i18n.insightsLimit }}</p>
+      <gl-alert class="gl-mb-4" :dismissible="false">
+        <p v-if="showLimitMessage" data-testid="limit-alert-text">
+          {{ $options.i18n.insightsLimit }}
+        </p>
         <gl-link href="https://gitlab.com/gitlab-org/gitlab/-/issues/365902" class="gl-mt-5">
           {{ $options.i18n.feeback }}
         </gl-link>
       </gl-alert>
-      <div class="gl-display-flex gl-justify-content-space-between gl-mb-7">
+
+      <div class="gl-display-flex gl-justify-content-space-between gl-mt-2 gl-mb-7">
         <gl-card class="gl-w-half gl-mr-7 gl-text-center">
           <template #header>
             <span class="gl-font-weight-bold">{{ $options.i18n.queuedCardHeader }}</span>
diff --git a/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js b/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js
index c4f7665c91d..e8e49cc652e 100644
--- a/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js
+++ b/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js
@@ -1,5 +1,6 @@
 import Visibility from 'visibilityjs';
-import createFlash from '~/flash';
+import createFlash, { createAlert } from '~/flash';
+import { helpPagePath } from '~/helpers/help_page_helper';
 import { historyPushState, buildUrlWithCurrentLocation } from '~/lib/utils/common_utils';
 import httpStatusCodes from '~/lib/utils/http_status';
 import Poll from '~/lib/utils/poll';
@@ -198,18 +199,20 @@ export default {
         })
         .catch((e) => {
           const unauthorized = e.response.status === httpStatusCodes.UNAUTHORIZED;
-          const badRequest = e.response.status === httpStatusCodes.BAD_REQUEST;
-
           let errorMessage = __(
             'An error occurred while trying to run a new pipeline for this merge request.',
           );
 
-          if (unauthorized || badRequest) {
+          if (unauthorized) {
             errorMessage = __('You do not have permission to run a pipeline on this branch.');
           }
 
-          createFlash({
+          createAlert({
             message: errorMessage,
+            primaryButton: {
+              text: __('Learn more'),
+              link: helpPagePath('ci/pipelines/merge_request_pipelines.md'),
+            },
           });
         })
         .finally(() => this.store.toggleIsRunningPipeline(false));