From 387c4b2c21a44360386a9b8ce6849e7f1b8a3de9 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Thu, 4 May 2017 15:11:15 +0300 Subject: Backport of multiple_assignees_feature [ci skip] --- config/webpack.config.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index 0ec9e48845e..8cacafd611f 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -33,7 +33,11 @@ var config = { graphs: './graphs/graphs_bundle.js', group: './group.js', groups_list: './groups_list.js', +<<<<<<< HEAD issuable: './issuable/issuable_bundle.js', +======= + issues: './issues/issues_bundle.js', +>>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master issue_show: './issue_show/index.js', main: './main.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', @@ -46,6 +50,7 @@ var config = { profile: './profile/profile_bundle.js', protected_branches: './protected_branches/protected_branches_bundle.js', protected_tags: './protected_tags', + sidebar: './sidebar/sidebar_bundle.js', snippet: './snippet/snippet_bundle.js', sketch_viewer: './blob/sketch_viewer.js', stl_viewer: './blob/stl_viewer.js', @@ -125,7 +130,7 @@ var config = { 'diff_notes', 'environments', 'environments_folder', - 'issuable', + 'sidebar', 'issue_show', 'merge_conflicts', 'notebook_viewer', -- cgit v1.2.3 From dde9b6698bb67dc34650a588ad3e644843067800 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Thu, 4 May 2017 10:08:55 -0500 Subject: Fix webpack config conflict --- config/webpack.config.js | 5 ----- 1 file changed, 5 deletions(-) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index 8cacafd611f..97597397b75 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -33,11 +33,6 @@ var config = { graphs: './graphs/graphs_bundle.js', group: './group.js', groups_list: './groups_list.js', -<<<<<<< HEAD - issuable: './issuable/issuable_bundle.js', -======= - issues: './issues/issues_bundle.js', ->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master issue_show: './issue_show/index.js', main: './main.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', -- cgit v1.2.3 From 40f51c8e8172933ec511dd828a589abb52d83c45 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Fri, 5 May 2017 09:19:58 -0500 Subject: [skip ci] Fix FE conflicts with master --- config/webpack.config.js | 5 ----- 1 file changed, 5 deletions(-) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index a539dc511fa..bc2aa1ebf0c 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -34,11 +34,6 @@ var config = { graphs: './graphs/graphs_bundle.js', group: './group.js', groups_list: './groups_list.js', -<<<<<<< HEAD -======= - issuable: './issuable/issuable_bundle.js', - locale: './locale/index.js', ->>>>>>> 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77 issue_show: './issue_show/index.js', locale: './locale/index.js', main: './main.js', -- cgit v1.2.3