Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

4 files changed, 11 insertions, 11 deletions

diff --git a/app/assets/javascripts/reports/codequality_report/components/codequality_issue_body.vue b/app/assets/javascripts/reports/codequality_report/components/codequality_issue_body.vue
index 59bd54eab60..fb2ef850e4f 100644
--- a/app/assets/javascripts/reports/codequality_report/components/codequality_issue_body.vue
+++ b/app/assets/javascripts/reports/codequality_report/components/codequality_issue_body.vue
@@ -34,7 +34,7 @@ export default {
       return `${this.severityLabel} - ${this.issue.name}`;
     },
     issueSeverity() {
-      return this.issue.severity.toLowerCase();
+      return this.issue.severity?.toLowerCase();
     },
     isStatusSuccess() {
       return this.status === STATUS_SUCCESS;
diff --git a/app/assets/javascripts/reports/components/report_section.vue b/app/assets/javascripts/reports/components/report_section.vue
index 7a490210f0b..0714d88b392 100644
--- a/app/assets/javascripts/reports/components/report_section.vue
+++ b/app/assets/javascripts/reports/components/report_section.vue
@@ -3,7 +3,7 @@ import { GlButton } from '@gitlab/ui';
 import api from '~/api';
 import { __ } from '~/locale';
 import StatusIcon from '~/vue_merge_request_widget/components/mr_widget_status_icon.vue';
-import Popover from '~/vue_shared/components/help_popover.vue';
+import HelpPopover from '~/vue_shared/components/help_popover.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { status, SLOT_SUCCESS, SLOT_LOADING, SLOT_ERROR } from '../constants';
 import IssuesList from './issues_list.vue';
@@ -13,7 +13,7 @@ export default {
   components: {
     GlButton,
     IssuesList,
-    Popover,
+    HelpPopover,
     StatusIcon,
   },
   mixins: [glFeatureFlagsMixin()],
@@ -172,7 +172,7 @@ export default {
   },
   methods: {
     toggleCollapsed() {
-      if (this.trackAction && this.glFeatures.usersExpandingWidgetsUsageData) {
+      if (this.trackAction) {
         api.trackRedisHllUserEvent(this.trackAction);
       }
 
@@ -193,7 +193,7 @@ export default {
           <div class="gl-display-flex gl-align-items-center">
             <p class="gl-line-height-normal gl-m-0">{{ headerText }}</p>
             <slot :name="slotName"></slot>
-            <popover
+            <help-popover
               v-if="hasPopover"
               :options="popoverOptions"
               class="gl-ml-2 gl-display-inline-flex"
diff --git a/app/assets/javascripts/reports/components/summary_row.vue b/app/assets/javascripts/reports/components/summary_row.vue
index 6b7d81c4878..7419b5b59d6 100644
--- a/app/assets/javascripts/reports/components/summary_row.vue
+++ b/app/assets/javascripts/reports/components/summary_row.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlLoadingIcon } from '@gitlab/ui';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
-import Popover from '~/vue_shared/components/help_popover.vue';
+import HelpPopover from '~/vue_shared/components/help_popover.vue';
 import { ICON_WARNING } from '../constants';
 
 /**
@@ -16,7 +16,7 @@ export default {
   name: 'ReportSummaryRow',
   components: {
     CiIcon,
-    Popover,
+    HelpPopover,
     GlLoadingIcon,
   },
   props: {
@@ -79,7 +79,7 @@ export default {
       <div class="report-block-list-issue-description-text" data-testid="summary-row-description">
         <slot name="summary">{{ summary }}</slot
         ><span v-if="popoverOptions" class="text-nowrap"
-          >&nbsp;<popover v-if="popoverOptions" :options="popoverOptions" class="align-top" />
+          >&nbsp;<help-popover v-if="popoverOptions" :options="popoverOptions" class="align-top" />
         </span>
       </div>
     </div>
diff --git a/app/assets/javascripts/reports/grouped_test_report/store/actions.js b/app/assets/javascripts/reports/grouped_test_report/store/actions.js
index e3db57ad846..73f8df016b6 100644
--- a/app/assets/javascripts/reports/grouped_test_report/store/actions.js
+++ b/app/assets/javascripts/reports/grouped_test_report/store/actions.js
@@ -1,7 +1,7 @@
 import Visibility from 'visibilityjs';
-import axios from '../../../lib/utils/axios_utils';
-import httpStatusCodes from '../../../lib/utils/http_status';
-import Poll from '../../../lib/utils/poll';
+import axios from '~/lib/utils/axios_utils';
+import httpStatusCodes from '~/lib/utils/http_status';
+import Poll from '~/lib/utils/poll';
 import * as types from './mutation_types';
 
 export const setPaths = ({ commit }, paths) => commit(types.SET_PATHS, paths);