Merge branch 'fix-incorrect-merge-request-pipeline-retry-warning' into 'master'

Fix incorrect retry warning when merge trains are enabled

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/158283



Merged-by: Hordur Freyr Yngvason <hfyngvason@gitlab.com>
Approved-by: Panos Kanellidis <pkanellidis@gitlab.com>
Approved-by: Vitali Tatarintev <vtatarintev@gitlab.com>

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

@@ -18,7 +18,6 @@ import LegacyPipelineMiniGraph from '~/ci/pipeline_mini_graph/legacy_pipeline_mi
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue';
 import runPipelineMixin from '../mixins/run_pipeline';
-import { MT_MERGE_STRATEGY } from '../constants';
 
 export default {
   name: 'MRWidgetPipeline',
@@ -170,7 +169,7 @@ export default {
       );
     },
     isMergeTrain() {
-      return this.mergeStrategy === MT_MERGE_STRATEGY;
+      return Boolean(this.pipeline.flags?.merge_train_pipeline);
     },
   },
   errorText: s__(

app/serializers/merge_requests/pipeline_entity.rb

@@ -14,6 +14,7 @@ class MergeRequests::PipelineEntity < Grape::Entity
   expose :flags do
     expose :merged_result_pipeline?, as: :merge_request_pipeline # deprecated, use merged_result_pipeline going forward
     expose :merged_result_pipeline?, as: :merged_result_pipeline
+    expose :merge_train_pipeline?, as: :merge_train_pipeline
   end
 
   expose :commit, using: CommitEntity

spec/serializers/merge_requests/pipeline_entity_spec.rb

@@ -35,7 +35,7 @@
       expect(subject[:ref]).to include(:branch)
       expect(subject[:details]).to include(:artifacts, :event_type_name, :status, :stages, :finished_at)
       expect(subject[:details][:status]).to include(:icon, :favicon, :text, :label, :tooltip)
-      expect(subject[:flags]).to include(:merge_request_pipeline)
+      expect(subject[:flags]).to include(:merge_request_pipeline, :merged_result_pipeline, :merge_train_pipeline)
 
       expect(subject[:details][:event_type_name]).to eq('Merged result pipeline')
     end