diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-30 07:48:13 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-30 07:48:13 +0000 |
| commit | a60020e4886834413712cf79c653f9e979299ef5 (patch) | |
| tree | d36fac7c5aae276753b2d0e964071c2370697709 /config | |
| parent | 1d8de967a1ef9235891ab5a6b9a654280f8a5cbf (diff) | |
| parent | c7e6eff4dd3a98a4f591801159a0ef1c1f896a62 (diff) | |
| download | gitlab-ce-a60020e4886834413712cf79c653f9e979299ef5.tar.gz | |
Merge branch '31849-pipeline-show-view-realtime' into 'master'
Creates a mediator for pipeline details vue in order to mount several vue apps with the same data
Closes #31849
See merge request !11732
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index ce140b75382..c77b1d6334c 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -24,6 +24,7 @@ var config = { }, context: path.join(ROOT_PATH, 'app/assets/javascripts'), entry: { + balsamiq_viewer: './blob/balsamiq_viewer.js', blob: './blob_edit/blob_bundle.js', boards: './boards/boards_bundle.js', common: './commons/index.js', @@ -48,8 +49,7 @@ var config = { notebook_viewer: './blob/notebook_viewer.js', pdf_viewer: './blob/pdf_viewer.js', pipelines: './pipelines/index.js', - balsamiq_viewer: './blob/balsamiq_viewer.js', - pipelines_graph: './pipelines/graph_bundle.js', + pipelines_details: './pipelines/pipeline_details_bundle.js', profile: './profile/profile_bundle.js', protected_branches: './protected_branches/protected_branches_bundle.js', protected_tags: './protected_tags', @@ -160,7 +160,7 @@ var config = { 'notebook_viewer', 'pdf_viewer', 'pipelines', - 'pipelines_graph', + 'pipelines_details', 'schedule_form', 'schedules_index', 'sidebar', |