Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 19 deletions

diff --git a/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue b/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue
index 6fe1459c80c..78d9b6fb70c 100644
--- a/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue
+++ b/app/assets/javascripts/pipeline_editor/components/header/pipeline_status.vue
@@ -21,9 +21,6 @@ export const i18n = {
   ),
   viewBtn: s__('Pipeline|View pipeline'),
   viewCommit: s__('Pipeline|View commit'),
-  pipelineNotTriggeredMsg: s__(
-    'Pipeline|No pipeline was triggered for the latest changes due to the current CI/CD configuration.',
-  ),
 };
 
 export default {
@@ -79,22 +76,16 @@ export default {
       result(res) {
         if (res.data?.project?.pipeline) {
           this.hasError = false;
-        } else {
-          this.hasError = true;
-          this.pipelineNotTriggered = true;
         }
       },
       error() {
         this.hasError = true;
-        this.networkError = true;
       },
       pollInterval: POLL_INTERVAL,
     },
   },
   data() {
     return {
-      networkError: false,
-      pipelineNotTriggered: false,
       hasError: false,
     };
   },
@@ -148,16 +139,8 @@ export default {
       </div>
     </template>
     <template v-else-if="hasError">
-      <div v-if="networkError">
-        <gl-icon class="gl-mr-auto" name="warning-solid" />
-        <span data-testid="pipeline-error-msg">{{ $options.i18n.fetchError }}</span>
-      </div>
-      <div v-else>
-        <gl-icon class="gl-mr-auto" name="information-o" />
-        <span data-testid="pipeline-not-triggered-error-msg">
-          {{ $options.i18n.pipelineNotTriggeredMsg }}
-        </span>
-      </div>
+      <gl-icon class="gl-mr-auto" name="warning-solid" />
+      <span data-testid="pipeline-error-msg">{{ $options.i18n.fetchError }}</span>
     </template>
     <template v-else>
       <div class="gl-text-truncate gl-md-max-w-50p gl-mr-1">