diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-19 15:04:44 +0000 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-19 15:04:44 +0000 |
| commit | 0d79fe7ed94a41132d63b6ae42e96417368b6ce0 (patch) | |
| tree | 29037307f72a732fd2229faf2bffeb2aaf5ca628 /app/assets/javascripts | |
| parent | 3028cd687a256b593272248e50a3174811594e64 (diff) | |
| parent | 4882303760c9f22112985f78746f2416b701a47b (diff) | |
| download | gitlab-ce-0d79fe7ed94a41132d63b6ae42e96417368b6ce0.tar.gz | |
Merge branch '64677-delete-directory-webide' into 'master'
Fixed deletion of directories in Web IDE
Closes #64677
See merge request gitlab-org/gitlab-ce!31727
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/ide/stores/utils.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/stores/utils.js b/app/assets/javascripts/ide/stores/utils.js index 04e86afb268..52200ce7847 100644 --- a/app/assets/javascripts/ide/stores/utils.js +++ b/app/assets/javascripts/ide/stores/utils.js @@ -129,7 +129,7 @@ export const commitActionForFile = file => { export const getCommitFiles = stagedFiles => stagedFiles.reduce((acc, file) => { - if (file.moved) return acc; + if (file.moved || file.type === 'tree') return acc; return acc.concat({ ...file, |