diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-10-16 14:48:45 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-10-16 14:48:45 +0000 |
| commit | b69861c204a6295a413802255f18606bb8c71db9 (patch) | |
| tree | bc27af69e9a35f7cbcbb0392b7e3bfd577ed39ab /app/assets | |
| parent | 42a69d7522ea0d5efc16b202a3d110ca00185a6e (diff) | |
| parent | 077ecf8a80733878fd35a407bdd623273598c3e2 (diff) | |
| download | gitlab-ce-b69861c204a6295a413802255f18606bb8c71db9.tar.gz | |
Merge branch 'ide-update-monaco' into 'master'
Upgrading Monaco
Closes #38607
See merge request gitlab-org/gitlab-ce!14629
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/repo/components/repo_editor.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/repo/components/repo_editor.vue b/app/assets/javascripts/repo/components/repo_editor.vue index 02d9c775046..2c597a3cd65 100644 --- a/app/assets/javascripts/repo/components/repo_editor.vue +++ b/app/assets/javascripts/repo/components/repo_editor.vue @@ -22,7 +22,8 @@ const RepoEditor = { const monacoInstance = Helper.monaco.editor.create(this.$el, { model: null, readOnly: false, - contextmenu: false, + contextmenu: true, + scrollBeyondLastLine: false, }); Helper.monacoInstance = monacoInstance; |