Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-03-28 22:29:02 +0300
committerJacob Schatz <jschatz@gitlab.com>2017-03-28 22:29:02 +0300
commit47aeacd7f5b214d24dcb02bf0a42774415f5083d (patch)
tree130f356d8177ab6688a5e9236f77cc92887e2867 /config
parent5f6c32e1452cc25d47db9d5e66d3a5b1b453ceb3 (diff)
parent0f790dbccc506d59feeae2799163e3f00198dee2 (diff)
Merge branch 'ipython-notebook-viewer' into 'master'
iPython notebook viewer See merge request !10017
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 30e9e9c09b4..70d98b022c1 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -37,6 +37,7 @@ var config = {
merge_request_widget: './merge_request_widget/ci_bundle.js',
monitoring: './monitoring/monitoring_bundle.js',
network: './network/network_bundle.js',
+ notebook_viewer: './blob/notebook_viewer.js',
profile: './profile/profile_bundle.js',
protected_branches: './protected_branches/protected_branches_bundle.js',
snippet: './snippet/snippet_bundle.js',
@@ -105,6 +106,7 @@ var config = {
'environments_folder',
'issuable',
'merge_conflicts',
+ 'notebook_viewer',
'vue_pipelines',
],
minChunks: function(module, count) {