diff options
author | Phil Hughes <me@iamphill.com> | 2018-04-25 12:40:20 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-04-25 12:40:20 +0100 |
commit | 9f35f6d9d53638aeb8ee917a388705458ddd87d7 (patch) | |
tree | f9b51f30963490c93bd6a0bc65d6a995b816b105 | |
parent | af507c794442f5615a805f97acfea69f6444fc36 (diff) | |
download | gitlab-ce-9f35f6d9d53638aeb8ee917a388705458ddd87d7.tar.gz |
fixed commit files not opening correctly
-rw-r--r-- | app/assets/javascripts/ide/stores/actions/file.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ide/stores/mutations/file.js | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index d782e0a84d2..a6ad7d54ae1 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -193,7 +193,7 @@ export const unstageChange = ({ commit }, path) => { }; export const openPendingTab = ({ commit, getters, dispatch, state }, { file, keyPrefix }) => { - if (getters.activeFile && getters.activeFile === file && state.viewer === 'diff') { + if (getters.activeFile && getters.activeFile.path === file.path && state.viewer === 'diff') { return false; } diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js index c3041c77199..7f670eb744c 100644 --- a/app/assets/javascripts/ide/stores/mutations/file.js +++ b/app/assets/javascripts/ide/stores/mutations/file.js @@ -192,6 +192,10 @@ export default { return acc.concat(f); }, []); + } else { + openFiles = state.openFiles.map(f => + Object.assign(f, { active: f.key === key, opened: f.key === key }), + ); } Object.assign(state, { openFiles }); |