Add latest changes from gitlab-org/gitlab@master

4 files changed, 3 insertions, 7 deletions

diff --git a/app/assets/javascripts/boards/boards_util.js b/app/assets/javascripts/boards/boards_util.js
index 9fca9860282..8062460f052 100644
--- a/app/assets/javascripts/boards/boards_util.js
+++ b/app/assets/javascripts/boards/boards_util.js
@@ -38,10 +38,8 @@ export function formatIssue(issue) {
 
 export function formatListIssues(listIssues) {
   const boardItems = {};
-  let listItemsCount;
 
   const listData = listIssues.nodes.reduce((map, list) => {
-    listItemsCount = list.issuesCount;
     let sortedIssues = list.issues.edges.map((issueNode) => ({
       ...issueNode.node,
     }));
@@ -67,7 +65,7 @@ export function formatListIssues(listIssues) {
     };
   }, {});
 
-  return { listData, boardItems, listItemsCount };
+  return { listData, boardItems };
 }
 
 export function formatListsPageInfo(lists) {
diff --git a/app/assets/javascripts/boards/components/board_list_header.vue b/app/assets/javascripts/boards/components/board_list_header.vue
index a65269de743..e3012f5b36d 100644
--- a/app/assets/javascripts/boards/components/board_list_header.vue
+++ b/app/assets/javascripts/boards/components/board_list_header.vue
@@ -117,7 +117,7 @@ export default {
       return 'issues';
     },
     itemsTooltipLabel() {
-      return n__(`%d issue`, `%d issues`, this.boardLists?.issuesCount);
+      return n__(`%d issue`, `%d issues`, this.boardList?.issuesCount);
     },
     chevronTooltip() {
       return this.list.collapsed ? this.$options.i18n.expand : this.$options.i18n.collapse;
diff --git a/app/assets/javascripts/boards/graphql/lists_issues.query.graphql b/app/assets/javascripts/boards/graphql/lists_issues.query.graphql
index bf5329c4a8d..ae6394f9a2f 100644
--- a/app/assets/javascripts/boards/graphql/lists_issues.query.graphql
+++ b/app/assets/javascripts/boards/graphql/lists_issues.query.graphql
@@ -17,7 +17,6 @@ query BoardListsEE(
       lists(id: $id, issueFilters: $filters) {
         nodes {
           id
-          issuesCount
           listType
           issues(first: $first, filters: $filters, after: $after) {
             edges {
@@ -41,7 +40,6 @@ query BoardListsEE(
       lists(id: $id, issueFilters: $filters) {
         nodes {
           id
-          issuesCount
           listType
           issues(first: $first, filters: $filters, after: $after) {
             edges {
diff --git a/app/assets/javascripts/boards/stores/mutations.js b/app/assets/javascripts/boards/stores/mutations.js
index 04e7d3643e7..26a98a645b3 100644
--- a/app/assets/javascripts/boards/stores/mutations.js
+++ b/app/assets/javascripts/boards/stores/mutations.js
@@ -11,7 +11,7 @@ const updateListItemsCount = ({ state, listId, value }) => {
   if (state.issuableType === issuableTypes.epic) {
     Vue.set(state.boardLists, listId, { ...list, epicsCount: list.epicsCount + value });
   } else {
-    Vue.set(state.boardLists, listId, { ...list, issuesCount: list.issuesCount + value });
+    Vue.set(state.boardLists, listId, { ...list });
   }
 };