diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-21 11:06:39 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-22 10:33:20 +0000 |
| commit | ba63bda9550d3d66545e71de1f78a3089c7dc014 (patch) | |
| tree | e45edc9102fd2ef9957c3def1642aa040e0d0253 /app/assets/javascripts/ide/lib | |
| parent | 51c64f3fc7180732621d60f939bfe6157165040f (diff) | |
| download | gitlab-ce-ba63bda9550d3d66545e71de1f78a3089c7dc014.tar.gz | |
correctly stages and unstages files
after a commit the files are correctly reset
correctly enables the ability to have different staged & unstaged changes in the same file
Diffstat (limited to 'app/assets/javascripts/ide/lib')
| -rw-r--r-- | app/assets/javascripts/ide/lib/common/model.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/lib/common/model.js b/app/assets/javascripts/ide/lib/common/model.js index 73cd684351c..ef395b276af 100644 --- a/app/assets/javascripts/ide/lib/common/model.js +++ b/app/assets/javascripts/ide/lib/common/model.js @@ -69,9 +69,12 @@ export default class Model { ); } - updateContent(content) { + updateContent({ content, changed }) { this.getOriginalModel().setValue(content); - this.getModel().setValue(content); + + if (!changed) { + this.getModel().setValue(content); + } } dispose() { |