Add latest changes from gitlab-org/gitlab@master

6 files changed, 7 insertions, 21 deletions

diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue
index b2fa020fb00..9961c0df52e 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/index.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue
@@ -64,7 +64,7 @@ export default {
         class="rounded border-0 d-flex ide-entry-dropdown-toggle"
         @click.stop="openDropdown()"
       >
-        <icon name="ellipsis_v" /> <icon name="arrow-down" />
+        <icon name="ellipsis_v" /> <icon name="chevron-down" />
       </button>
       <ul ref="dropdownMenu" class="dropdown-menu dropdown-menu-right">
         <template v-if="type === 'tree'">
diff --git a/app/assets/javascripts/ide/stores/actions.js b/app/assets/javascripts/ide/stores/actions.js
index 34e7cc304dd..9bc008c0dd5 100644
--- a/app/assets/javascripts/ide/stores/actions.js
+++ b/app/assets/javascripts/ide/stores/actions.js
@@ -86,7 +86,6 @@ export const createTempEntry = (
 
     dispatch('setFileActive', file.path);
     dispatch('triggerFilesChange');
-    dispatch('burstUnusedSeal');
   }
 
   if (parentPath && !state.entries[parentPath].opened) {
@@ -175,12 +174,6 @@ export const updateTempFlagForEntry = ({ commit, dispatch, state }, { file, temp
 export const toggleFileFinder = ({ commit }, fileFindVisible) =>
   commit(types.TOGGLE_FILE_FINDER, fileFindVisible);
 
-export const burstUnusedSeal = ({ state, commit }) => {
-  if (state.unusedSeal) {
-    commit(types.BURST_UNUSED_SEAL);
-  }
-};
-
 export const setLinks = ({ commit }, links) => commit(types.SET_LINKS, links);
 
 export const setErrorMessage = ({ commit }, errorMessage) =>
@@ -209,8 +202,6 @@ export const deleteEntry = ({ commit, dispatch, state }, path) => {
     return;
   }
 
-  dispatch('burstUnusedSeal');
-
   if (entry.opened) dispatch('closeFile', entry);
 
   if (isTree) {
@@ -262,8 +253,6 @@ export const renameEntry = ({ dispatch, commit, state, getters }, { path, name,
       if (gon.features?.stageAllByDefault)
         commit(types.STAGE_CHANGE, { path: newPath, diffInfo: getters.getDiffInfo(newPath) });
       else commit(types.ADD_FILE_TO_CHANGED, newPath);
-
-      dispatch('burstUnusedSeal');
     }
 
     if (!newEntry.tempFile) {
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index 55ee8a699c8..052120059c4 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -148,7 +148,7 @@ export const getRawFileData = ({ state, commit, dispatch, getters }, { path }) =
   });
 };
 
-export const changeFileContent = ({ commit, dispatch, state, getters }, { path, content }) => {
+export const changeFileContent = ({ commit, state, getters }, { path, content }) => {
   const file = state.entries[path];
   commit(types.UPDATE_FILE_CONTENT, {
     path,
@@ -164,8 +164,6 @@ export const changeFileContent = ({ commit, dispatch, state, getters }, { path,
   } else if (!file.changed && !file.tempFile && indexOfChangedFile !== -1) {
     commit(types.REMOVE_FILE_FROM_CHANGED, path);
   }
-
-  dispatch('burstUnusedSeal', {}, { root: true });
 };
 
 export const setFileLanguage = ({ getters, commit }, { fileLanguage }) => {
diff --git a/app/assets/javascripts/ide/stores/mutation_types.js b/app/assets/javascripts/ide/stores/mutation_types.js
index 4dde53a9fdf..78831bdf022 100644
--- a/app/assets/javascripts/ide/stores/mutation_types.js
+++ b/app/assets/javascripts/ide/stores/mutation_types.js
@@ -67,7 +67,6 @@ export const REMOVE_PENDING_TAB = 'REMOVE_PENDING_TAB';
 export const UPDATE_ACTIVITY_BAR_VIEW = 'UPDATE_ACTIVITY_BAR_VIEW';
 export const UPDATE_TEMP_FLAG = 'UPDATE_TEMP_FLAG';
 export const TOGGLE_FILE_FINDER = 'TOGGLE_FILE_FINDER';
-export const BURST_UNUSED_SEAL = 'BURST_UNUSED_SEAL';
 
 export const CLEAR_PROJECTS = 'CLEAR_PROJECTS';
 export const RESET_OPEN_FILES = 'RESET_OPEN_FILES';
diff --git a/app/assets/javascripts/ide/stores/mutations.js b/app/assets/javascripts/ide/stores/mutations.js
index e84e2782e46..49485f4d575 100644
--- a/app/assets/javascripts/ide/stores/mutations.js
+++ b/app/assets/javascripts/ide/stores/mutations.js
@@ -180,11 +180,6 @@ export default {
       });
     }
   },
-  [types.BURST_UNUSED_SEAL](state) {
-    Object.assign(state, {
-      unusedSeal: false,
-    });
-  },
   [types.SET_LINKS](state, links) {
     Object.assign(state, { links });
   },
@@ -226,6 +221,8 @@ export default {
         state.changedFiles = state.changedFiles.concat(entry);
       }
     }
+
+    state.unusedSeal = false;
   },
   [types.RENAME_ENTRY](state, { path, name, parentPath }) {
     const oldEntry = state.entries[path];
diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js
index 313fa1fe029..5c5920a3027 100644
--- a/app/assets/javascripts/ide/stores/mutations/file.js
+++ b/app/assets/javascripts/ide/stores/mutations/file.js
@@ -153,11 +153,13 @@ export default {
   [types.ADD_FILE_TO_CHANGED](state, path) {
     Object.assign(state, {
       changedFiles: state.changedFiles.concat(state.entries[path]),
+      unusedSeal: false,
     });
   },
   [types.REMOVE_FILE_FROM_CHANGED](state, path) {
     Object.assign(state, {
       changedFiles: state.changedFiles.filter(f => f.path !== path),
+      unusedSeal: false,
     });
   },
   [types.STAGE_CHANGE](state, { path, diffInfo }) {
@@ -173,6 +175,7 @@ export default {
           deleted: diffInfo.deleted,
         }),
       }),
+      unusedSeal: false,
     });
 
     if (stagedFile) {