Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/app/assets/javascripts/mr_notes/init.js b/app/assets/javascripts/mr_notes/init.js
index aab3c41b4cf..79447bc115d 100644
--- a/app/assets/javascripts/mr_notes/init.js
+++ b/app/assets/javascripts/mr_notes/init.js
@@ -20,7 +20,6 @@ function setupMrNotesState(notesDataset) {
   store.dispatch('setUserData', currentUserData);
   store.dispatch('setTargetNoteHash', getLocationHash());
   store.dispatch('setEndpoints', endpoints);
-  eventHub.$once('fetchNotesData', () => store.dispatch('fetchNotes'));
 }
 
 export function initMrStateLazyLoad() {
@@ -35,10 +34,13 @@ export function initMrStateLazyLoad() {
   stop = store.watch(
     (state) => state.page.activeTab,
     (activeTab) => {
+      setupMrNotesState(notesDataset);
+
       // prevent loading MR state on commits and pipelines pages
       // this is due to them having a shared controller with the Overview page
       if (['diffs', 'show'].includes(activeTab)) {
-        setupMrNotesState(notesDataset);
+        eventHub.$once('fetchNotesData', () => store.dispatch('fetchNotes'));
+
         requestIdleCallback(() => {
           initReviewBar();
           initOverviewTabCounter();