Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
index 908cbfd6dc8..a44b9827fe9 100644
--- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
+++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
@@ -138,6 +138,12 @@ export const scrollToDraft = ({ dispatch, rootGetters }, draft) => {
     window.mrTabs.tabShown(tab);
   }
 
+  const { file_path: filePath } = draft;
+
+  if (filePath) {
+    dispatch('diffs/setFileCollapsedAutomatically', { filePath, collapsed: false }, { root: true });
+  }
+
   if (discussion) {
     dispatch('expandDiscussion', { discussionId: discussion.id }, { root: true });
   }