diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-05-04 15:11:15 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-05-04 17:11:53 +0300 |
| commit | 387c4b2c21a44360386a9b8ce6849e7f1b8a3de9 (patch) | |
| tree | 446b8338efe8ad22ca03b00b2dc72b22c4174e02 /config | |
| parent | 68c12e15cc236548918f91393ebef3c06c124814 (diff) | |
| download | gitlab-ce-387c4b2c21a44360386a9b8ce6849e7f1b8a3de9.tar.gz | |
Backport of multiple_assignees_feature [ci skip]
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 7 |
1 files changed, 6 insertions, 1 deletions
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', |