diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-05-05 22:17:28 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-05-05 22:17:28 +0300 |
| commit | aa874a1cd6fc94f6291a59fb414f3b09b3337c0d (patch) | |
| tree | 1fbc687d9732273715115d0b945f329ce1d41a17 /config | |
| parent | 0c5b7f8475926a5c97d42649dd12f4b4a32071d4 (diff) | |
| parent | 933447e0da19f9d0be8574185500cabb5d7ab012 (diff) | |
Merge branch 'mia_backort' into 'master'
Backport of Multiple Assignees feature
See merge request !11089
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 160dc9057f2..119b1ea9d2e 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -38,8 +38,6 @@ var config = { graphs: './graphs/graphs_bundle.js', group: './group.js', groups_list: './groups_list.js', - issuable: './issuable/issuable_bundle.js', - locale: './locale/index.js', issue_show: './issue_show/index.js', locale: './locale/index.js', main: './main.js', @@ -54,6 +52,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', @@ -139,7 +138,7 @@ var config = { 'diff_notes', 'environments', 'environments_folder', - 'issuable', + 'sidebar', 'issue_show', 'merge_conflicts', 'notebook_viewer', |