diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-26 12:37:58 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-26 12:37:58 +0000 |
commit | f6eeb1350b93d1cfce401695aa77c8464f26f26b (patch) | |
tree | 0dfbef61e0b4ccff05f622af7f87cd6e7d0d971e | |
parent | 1de22c672e3238011e9f3d618484424805fe8437 (diff) | |
parent | e10bd302a5f1739c9f43b12798b8c29d19690a64 (diff) | |
download | gitlab-ce-f6eeb1350b93d1cfce401695aa77c8464f26f26b.tar.gz |
Merge branch 'ide-diff-cursor' into 'master'
Disable cursor for review mode in the IDE
Closes #44307
See merge request gitlab-org/gitlab-ce!17955
-rw-r--r-- | app/assets/javascripts/ide/lib/editor.js | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 4 | ||||
-rw-r--r-- | spec/javascripts/ide/lib/editor_spec.js | 4 |
3 files changed, 12 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, })), ); diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 7a8fbfc517d..57b995adb64 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -290,6 +290,10 @@ .margin-view-overlays .delete-sign { opacity: 0.4; } + + .cursors-layer { + display: none; + } } } diff --git a/spec/javascripts/ide/lib/editor_spec.js b/spec/javascripts/ide/lib/editor_spec.js index d6df35c90e8..3c48d94d17a 100644 --- a/spec/javascripts/ide/lib/editor_spec.js +++ b/spec/javascripts/ide/lib/editor_spec.js @@ -74,6 +74,10 @@ describe('Multi-file editor library', () => { }, readOnly: true, scrollBeyondLastLine: false, + quickSuggestions: false, + occurrencesHighlight: false, + renderLineHighlight: 'none', + hideCursorInOverviewRuler: true, }, ); }); |