diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-10-05 14:49:16 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-05 14:49:16 +0900 |
| commit | 88cc9d5294198cfa748d602236729abcd73f56a6 (patch) | |
| tree | 6eb5be9ed46ec720ba195702d80e166980868146 /config/webpack.config.js | |
| parent | d6e22e83d1fe8ffaa71c3bcb7906731733a89f0e (diff) | |
| parent | 8921af39e74976e37e92c786bd957883110f6522 (diff) | |
| download | gitlab-ce-88cc9d5294198cfa748d602236729abcd73f56a6.tar.gz | |
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 3404715fe30..c515a170d2d 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -68,6 +68,7 @@ var config = { prometheus_metrics: './prometheus_metrics', protected_branches: './protected_branches', protected_tags: './protected_tags', + registry_list: './registry/index.js', repo: './repo/index.js', sidebar: './sidebar/sidebar_bundle.js', schedule_form: './pipeline_schedules/pipeline_schedule_form_bundle.js', @@ -122,10 +123,6 @@ var config = { } }, { - test: /locale\/\w+\/(.*)\.js$/, - loader: 'exports-loader?locales', - }, - { test: /monaco-editor\/\w+\/vs\/loader\.js$/, use: [ { loader: 'exports-loader', options: 'l.global' }, @@ -200,6 +197,7 @@ var config = { 'pdf_viewer', 'pipelines', 'pipelines_details', + 'registry_list', 'repo', 'schedule_form', 'schedules_index', @@ -222,7 +220,7 @@ var config = { // create cacheable common library bundles new webpack.optimize.CommonsChunkPlugin({ - names: ['main', 'locale', 'common', 'webpack_runtime'], + names: ['main', 'common', 'webpack_runtime'], }), // enable scope hoisting |