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 | |
| 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
| -rw-r--r-- | app/assets/javascripts/repo/components/repo_editor.vue | 3 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
4 files changed, 7 insertions, 6 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; diff --git a/config/webpack.config.js b/config/webpack.config.js index a71794b379d..f7a7182a627 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -236,7 +236,7 @@ var config = { from: path.join(ROOT_PATH, `node_modules/monaco-editor/${IS_PRODUCTION ? 'min' : 'dev'}/vs`), to: 'monaco-editor/vs', transform: function(content, path) { - if (/\.js$/.test(path) && !/worker/i.test(path)) { + if (/\.js$/.test(path) && !/worker/i.test(path) && !/typescript/i.test(path)) { return ( '(function(){\n' + 'var define = this.define, require = this.require;\n' + diff --git a/package.json b/package.json index b670415deb4..620b39766f4 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "jszip": "^3.1.3", "jszip-utils": "^0.0.2", "marked": "^0.3.6", - "monaco-editor": "0.8.3", + "monaco-editor": "0.10.0", "mousetrap": "^1.4.6", "name-all-modules-plugin": "^1.0.1", "pikaday": "^1.5.1", diff --git a/yarn.lock b/yarn.lock index 64b27c0556f..b830278eab0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4148,9 +4148,9 @@ moment@2.x: version "2.17.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82" -monaco-editor@0.8.3: - version "0.8.3" - resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.8.3.tgz#523bdf2d1524db2c2dfc3cae0a7b6edc48d6dea6" +monaco-editor@0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.10.0.tgz#6604932585fe9c1f993f000a503d0d20fbe5896a" mousetrap@^1.4.6: version "1.4.6" |