Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 20 deletions

diff --git a/app/assets/javascripts/commons/nav/user_merge_requests.js b/app/assets/javascripts/commons/nav/user_merge_requests.js
index 784e9cb2faa..b105273ece7 100644
--- a/app/assets/javascripts/commons/nav/user_merge_requests.js
+++ b/app/assets/javascripts/commons/nav/user_merge_requests.js
@@ -26,39 +26,20 @@ function updateMergeRequestCounts(newCount) {
   mergeRequestsCountEl.classList.toggle('gl-display-none', Number(newCount) === 0);
 }
 
-function updateAttentionRequestsCount(count) {
-  const attentionCountEl = document.querySelector('.js-attention-count');
-  attentionCountEl.textContent = count.toLocaleString();
-
-  if (Number(count) === 0) {
-    attentionCountEl.classList.replace('badge-warning', 'badge-neutral');
-  } else {
-    attentionCountEl.classList.replace('badge-neutral', 'badge-warning');
-  }
-}
-
 /**
  * Refresh user counts (and broadcast if open)
  */
 export function refreshUserMergeRequestCounts() {
   return getUserCounts()
     .then(({ data }) => {
-      const attentionRequestsEnabled = window.gon?.features?.mrAttentionRequests;
       const assignedMergeRequests = data.assigned_merge_requests;
       const reviewerMergeRequests = data.review_requested_merge_requests;
-      const attentionRequests = data.attention_requests;
-      const fullCount = attentionRequestsEnabled
-        ? attentionRequests
-        : assignedMergeRequests + reviewerMergeRequests;
+      const fullCount = assignedMergeRequests + reviewerMergeRequests;
 
       updateUserMergeRequestCounts(assignedMergeRequests);
       updateReviewerMergeRequestCounts(reviewerMergeRequests);
       updateMergeRequestCounts(fullCount);
       broadcastCount(fullCount);
-
-      if (attentionRequestsEnabled) {
-        updateAttentionRequestsCount(attentionRequests);
-      }
     })
     .catch((ex) => {
       console.error(ex); // eslint-disable-line no-console