diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-13 09:35:52 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-06-13 09:35:52 +0000 |
commit | 8a23bcc9bc0f7ab453ee09d41a9407d40d57ba4c (patch) | |
tree | 53d6ddeaa1202ff3f02a71c95601606f4da62dea /app/assets/javascripts/ide/stores/mutations | |
parent | 929f12b61a6dbda7cd417ac2dd90cf9d3c94ad1c (diff) | |
download | gitlab-ce-8a23bcc9bc0f7ab453ee09d41a9407d40d57ba4c.tar.gz |
Image Diff Viewing + Download Diff Viewing
Diffstat (limited to 'app/assets/javascripts/ide/stores/mutations')
-rw-r--r-- | app/assets/javascripts/ide/stores/mutations/file.js | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js index 13f123b6630..5826f6cb828 100644 --- a/app/assets/javascripts/ide/stores/mutations/file.js +++ b/app/assets/javascripts/ide/stores/mutations/file.js @@ -1,5 +1,6 @@ /* eslint-disable no-param-reassign */ import * as types from '../mutation_types'; +import { diffModes } from '../../constants'; export default { [types.SET_FILE_ACTIVE](state, { path, active }) { @@ -85,8 +86,19 @@ export default { }); }, [types.SET_FILE_MERGE_REQUEST_CHANGE](state, { file, mrChange }) { + let diffMode = diffModes.replaced; + if (mrChange.new_file) { + diffMode = diffModes.new; + } else if (mrChange.deleted_file) { + diffMode = diffModes.deleted; + } else if (mrChange.renamed_file) { + diffMode = diffModes.renamed; + } Object.assign(state.entries[file.path], { - mrChange, + mrChange: { + ...mrChange, + diffMode, + }, }); }, [types.SET_FILE_VIEWMODE](state, { file, viewMode }) { |