Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 10 deletions

diff --git a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
index 6ac6dbfcb27..24c7a8dadaf 100644
--- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
+++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
@@ -10,7 +10,6 @@ import IssuesList from './issues_list.vue';
 import Modal from './modal.vue';
 import createStore from '../store';
 import Tracking from '~/tracking';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
   summaryTextBuilder,
   reportTextBuilder,
@@ -28,7 +27,7 @@ export default {
     Modal,
     GlButton,
   },
-  mixins: [glFeatureFlagsMixin(), Tracking.mixin()],
+  mixins: [Tracking.mixin()],
   props: {
     endpoint: {
       type: String,
@@ -92,7 +91,7 @@ export default {
       return reportTextBuilder(name, summary);
     },
     hasRecentFailures(summary) {
-      return this.glFeatures.testFailureHistory && summary?.recentlyFailed > 0;
+      return summary?.recentlyFailed > 0;
     },
     recentFailuresText(summary) {
       return recentFailuresTextBuilder(summary);
diff --git a/app/assets/javascripts/reports/components/test_issue_body.vue b/app/assets/javascripts/reports/components/test_issue_body.vue
index 69b0dcf881d..ad980b334bb 100644
--- a/app/assets/javascripts/reports/components/test_issue_body.vue
+++ b/app/assets/javascripts/reports/components/test_issue_body.vue
@@ -1,7 +1,6 @@
 <script>
 import { mapActions } from 'vuex';
 import { GlBadge, GlSprintf } from '@gitlab/ui';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
   name: 'TestIssueBody',
@@ -9,7 +8,6 @@ export default {
     GlBadge,
     GlSprintf,
   },
-  mixins: [glFeatureFlagsMixin()],
   props: {
     issue: {
       type: Object,
@@ -28,11 +26,7 @@ export default {
   },
   computed: {
     showRecentFailures() {
-      return (
-        this.glFeatures.testFailureHistory &&
-        this.issue.recent_failures?.count &&
-        this.issue.recent_failures?.base_branch
-      );
+      return this.issue.recent_failures?.count && this.issue.recent_failures?.base_branch;
     },
   },
   methods: {