Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 2 deletions

diff --git a/app/assets/javascripts/ide/stores/actions.js b/app/assets/javascripts/ide/stores/actions.js
index 2e7bf9a7d5a..dd69e2d6f1f 100644
--- a/app/assets/javascripts/ide/stores/actions.js
+++ b/app/assets/javascripts/ide/stores/actions.js
@@ -17,10 +17,18 @@ export const setInitialData = ({ commit }, data) => commit(types.SET_INITIAL_DAT
 
 export const discardAllChanges = ({ state, commit, dispatch }) => {
   state.changedFiles.forEach(file => {
-    commit(types.DISCARD_FILE_CHANGES, file.path);
+    if (file.tempFile || file.prevPath) dispatch('closeFile', file);
 
     if (file.tempFile) {
-      dispatch('closeFile', file);
+      dispatch('deleteEntry', file.path);
+    } else if (file.prevPath) {
+      dispatch('renameEntry', {
+        path: file.path,
+        name: file.prevName,
+        parentPath: file.prevParentPath,
+      });
+    } else {
+      commit(types.DISCARD_FILE_CHANGES, file.path);
     }
   });