summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/lib
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-03-27 11:24:06 +0100
committerPhil Hughes <me@iamphill.com>2018-03-27 11:24:06 +0100
commit74b77ebf50b458ebf9a5e9b5eebb2196c24f1387 (patch)
treec2cf08762b88f4802b548b38cef9e1a7e08ab0fc /app/assets/javascripts/ide/lib
parent3180f9a6b694066b86c89b3487c13caa1be52b0f (diff)
parent1d7ca033907d8dff18e74c41c391f58382f78ead (diff)
downloadgitlab-ce-74b77ebf50b458ebf9a5e9b5eebb2196c24f1387.tar.gz
Merge branch 'master' into ide-staged-changes
Diffstat (limited to 'app/assets/javascripts/ide/lib')
-rw-r--r--app/assets/javascripts/ide/lib/editor.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js
index 38de2fe2b27..887dd7e39b1 100644
--- a/app/assets/javascripts/ide/lib/editor.js
+++ b/app/assets/javascripts/ide/lib/editor.js
@@ -65,6 +65,10 @@ export default class Editor {
(this.instance = this.monaco.editor.createDiffEditor(domElement, {
...defaultEditorOptions,
readOnly: true,
+ quickSuggestions: false,
+ occurrencesHighlight: false,
+ renderLineHighlight: 'none',
+ hideCursorInOverviewRuler: true,
})),
);