From 85507b25e40ecbb99ec0e86519d383bea32e0b64 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Sun, 31 Jul 2016 18:31:56 +0300
Subject: [PATCH] Fixes for match lines in parallel view.
---
app/assets/javascripts/merge_conflict_data_provider.js.es6 | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/merge_conflict_data_provider.js.es6 b/app/assets/javascripts/merge_conflict_data_provider.js.es6
index ceb3422c577..37b949948f9 100644
--- a/app/assets/javascripts/merge_conflict_data_provider.js.es6
+++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6
@@ -67,8 +67,10 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
}
}
else {
- file.parallelLines.left.push({ lineType: 'context', lineNumber: line.old_line, richText: line.rich_text });
- file.parallelLines.right.push({ lineType: 'context', lineNumber: line.new_line, richText: line.rich_text });
+ const lineType = line.type || 'context';
+ const hasMatch = line.type === 'match';
+ file.parallelLines.left.push({ lineType, hasMatch, lineNumber: line.old_line, richText: line.rich_text });
+ file.parallelLines.right.push({ lineType, hasMatch, lineNumber: line.new_line, richText: line.rich_text });
}
});
});
--
GitLab