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:
authorTim Zallmann <tzallmann@gitlab.com>2018-03-25 15:02:09 +0300
committerTim Zallmann <tzallmann@gitlab.com>2018-03-28 13:17:02 +0300
commitb452bdead4f217b7488f13db9b608a9ddce1830e (patch)
tree412aa5b7de7372fc28addfe31edff1fe6a07eec0 /app/assets/javascripts/ide/lib/editor.js
parentf62359c23b86bb8c8dc241ff4e09bab24e74ccbd (diff)
Actual MR diff displayed
Diffstat (limited to 'app/assets/javascripts/ide/lib/editor.js')
-rw-r--r--app/assets/javascripts/ide/lib/editor.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js
index cdb277603f0..cb36300d25c 100644
--- a/app/assets/javascripts/ide/lib/editor.js
+++ b/app/assets/javascripts/ide/lib/editor.js
@@ -111,7 +111,7 @@ export default class Editor {
attachMergeRequestModel(model) {
this.instance.setModel({
- original: model.getTargetModel(),
+ original: model.getBaseModel(),
modified: model.getModel(),
});
}