diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2017-06-15 14:52:43 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2017-06-15 14:52:43 -0400 |
| commit | bf42ddbfabb8822b71d2b3efa97c9477f055f009 (patch) | |
| tree | fb7f3e2b76c58f707a500691432dba1829f5f1c9 | |
| parent | c6212840ed22443c434e9a44283c1e5c0f29ce4b (diff) | |
| download | gitlab-ce-bf42ddbfabb8822b71d2b3efa97c9477f055f009.tar.gz | |
Add monaco editor.
| -rw-r--r-- | app/assets/javascripts/repo/repo_bundle.js | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | yarn.lock | 4 |
4 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/repo/repo_bundle.js b/app/assets/javascripts/repo/repo_bundle.js new file mode 100644 index 00000000000..9ff303c4cd0 --- /dev/null +++ b/app/assets/javascripts/repo/repo_bundle.js @@ -0,0 +1 @@ +import monaco from 'monaco'
\ No newline at end of file diff --git a/config/webpack.config.js b/config/webpack.config.js index 120f9d3193d..760cde123bf 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -66,6 +66,7 @@ var config = { profile: './profile/profile_bundle.js', protected_branches: './protected_branches/protected_branches_bundle.js', protected_tags: './protected_tags', + repo: './repo/repo_bundle', sidebar: './sidebar/sidebar_bundle.js', schedule_form: './pipeline_schedules/pipeline_schedule_form_bundle.js', schedules_index: './pipeline_schedules/pipeline_schedules_index_bundle.js', diff --git a/package.json b/package.json index 29165fd4182..3ceea912a5d 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "jszip": "^3.1.3", "jszip-utils": "^0.0.2", "marked": "^0.3.6", + "monaco-editor": "0.8.3", "mousetrap": "^1.4.6", "name-all-modules-plugin": "^1.0.1", "pdfjs-dist": "^1.8.252", diff --git a/yarn.lock b/yarn.lock index 1db64aead8d..ddabf1c5a94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3720,6 +3720,10 @@ 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" + mousetrap@^1.4.6: version "1.4.6" resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.4.6.tgz#eaca72e22e56d5b769b7555873b688c3332e390a" |