Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-09 18:05:21 +0300
committerPhil Hughes <me@iamphill.com>2018-04-09 18:05:21 +0300
commit8fba385e792482850c68050ffe4234d0142b3e20 (patch)
treed4602d5222669376dd5874c749b643bd4a7ef9bc /app/assets/javascripts/ide/stores/actions/file.js
parent3af57c3cbc986a622117e5b722b06db736fd0bf1 (diff)
updated icons
fixed bug where unstaged file when discarded would not take staged file changes
Diffstat (limited to 'app/assets/javascripts/ide/stores/actions/file.js')
-rw-r--r--app/assets/javascripts/ide/stores/actions/file.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index e1ab48a4315..87016ff5e01 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -166,10 +166,7 @@ export const discardFileChanges = ({ state, commit }, path) => {
commit(types.TOGGLE_FILE_OPEN, path);
}
- eventHub.$emit(`editor.update.model.content.${file.key}`, {
- content: file.raw,
- changed: false,
- });
+ eventHub.$emit(`editor.update.model.new.content.${file.key}`, file.content);
};
export const stageChange = ({ commit, state }, path) => {