summaryrefslogtreecommitdiff
path: root/config/webpack.config.js
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-08-03 13:13:06 +0200
committerDouwe Maan <douwe@selenight.nl>2017-08-03 13:13:06 +0200
commit2197ee02e95ade455785cc1769bf3a40a082a799 (patch)
tree387a303a1bce6e5002c78a6d41c904ceffe2b357 /config/webpack.config.js
parentd0ffbd18fa5be4e90d150bc617d0cc7eb3c8720b (diff)
parent1018ab0516fd94d1ffbc05a0ad8499947dd9630d (diff)
downloadgitlab-ce-2197ee02e95ade455785cc1769bf3a40a082a799.tar.gz
Merge branch 'master' into ide
Diffstat (limited to 'config/webpack.config.js')
-rw-r--r--config/webpack.config.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 2748f5f2afe..d3dc512beca 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -40,6 +40,8 @@ var config = {
environments_folder: './environments/folder/environments_folder_bundle.js',
filtered_search: './filtered_search/filtered_search_bundle.js',
graphs: './graphs/graphs_bundle.js',
+ graphs_charts: './graphs/graphs_charts.js',
+ graphs_show: './graphs/graphs_show.js',
group: './group.js',
groups: './groups/index.js',
groups_list: './groups_list.js',
@@ -72,9 +74,12 @@ var config = {
stl_viewer: './blob/stl_viewer.js',
terminal: './terminal/terminal_bundle.js',
u2f: ['vendor/u2f'],
+ ui_development_kit: './ui_development_kit.js',
+ users: './users/index.js',
raven: './raven/index.js',
vue_merge_request_widget: './vue_merge_request_widget/index.js',
test: './test.js',
+ two_factor_auth: './two_factor_auth.js',
performance_bar: './performance_bar.js',
webpack_runtime: './webpack.js',
},