diff options
| author | Phil Hughes <me@iamphill.com> | 2018-04-26 10:13:10 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-04-26 10:13:10 +0100 |
| commit | c83ed559e107476a4cf9d50fd35874d523506486 (patch) | |
| tree | 3565d13bb447ba3b7a9c06e2991543514714de64 /app/assets/javascripts/ide/stores/actions | |
| parent | 70affaa0663f8fd4aa1aa08f85e35d312e78fee1 (diff) | |
| parent | 9f35f6d9d53638aeb8ee917a388705458ddd87d7 (diff) | |
| download | gitlab-ce-c83ed559e107476a4cf9d50fd35874d523506486.tar.gz | |
Merge branch 'ide-workbench-bar' into ide-activity-bar-review-mode
Diffstat (limited to 'app/assets/javascripts/ide/stores/actions')
| -rw-r--r-- | app/assets/javascripts/ide/stores/actions/file.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index 798edebd545..8bdf59dac26 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -192,7 +192,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; } |