diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-16 11:08:07 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-16 11:08:07 +0000 |
| commit | e5ecd9b196b200d4626c27d06a67fedafa87f119 (patch) | |
| tree | defa57b9a216531533d9177f69df000e44893b42 /config | |
| parent | 241ece877524ce4e6a4866e9bf0c593ba4b7a050 (diff) | |
| parent | d74c63e61b2e4e610f6880acb7cafcc4f5f42060 (diff) | |
| download | gitlab-ce-e5ecd9b196b200d4626c27d06a67fedafa87f119.tar.gz | |
Merge branch 'pipeline-chart-bundle' into 'master'
Updated pipelines charts to use dynamic webpack bundle
See merge request gitlab-org/gitlab-ce!17153
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 3c581a156dd..d6cb6a8892f 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -78,9 +78,7 @@ var config = { notes: './notes/index.js', pdf_viewer: './blob/pdf_viewer.js', pipelines: './pipelines/pipelines_bundle.js', - pipelines_charts: './pipelines/pipelines_charts.js', pipelines_details: './pipelines/pipeline_details_bundle.js', - pipelines_times: './pipelines/pipelines_times.js', profile: './profile/profile_bundle.js', project_import_gl: './projects/project_import_gitlab_project.js', prometheus_metrics: './prometheus_metrics', @@ -154,7 +152,7 @@ var config = { include: /node_modules\/katex\/dist/, use: [ { loader: 'style-loader' }, - { + { loader: 'css-loader', options: { name: '[name].[hash].[ext]' |