summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-02-23 11:58:24 -0600
committerMike Greiling <mike@pixelcog.com>2018-02-23 11:58:24 -0600
commitb817fb5cad7b2492d3fea3abedbcfd1797e66a68 (patch)
tree256ae2554a56c3e35117376f336c7d379806219a
parentc0c8250f46633b3c0477b2effa5739c35f927b54 (diff)
downloadgitlab-ce-remove-issues-show.tar.gz
remove issue_show webpack bundle in favor of pages/projects/issues/show/index.jsremove-issues-show
-rw-r--r--app/assets/javascripts/pages/projects/issues/show/index.js1
-rw-r--r--app/views/projects/issues/show.html.haml3
-rw-r--r--config/webpack.config.js2
3 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/javascripts/pages/projects/issues/show/index.js b/app/assets/javascripts/pages/projects/issues/show/index.js
index db064e3f801..1e56aa58da2 100644
--- a/app/assets/javascripts/pages/projects/issues/show/index.js
+++ b/app/assets/javascripts/pages/projects/issues/show/index.js
@@ -3,6 +3,7 @@ import Issue from '~/issue';
import ShortcutsIssuable from '~/shortcuts_issuable';
import ZenMode from '~/zen_mode';
import '~/notes/index';
+import '~/issue_show/index';
document.addEventListener('DOMContentLoaded', () => {
new Issue(); // eslint-disable-line no-new
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 91f68d8c419..7bc5c46d64a 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -82,6 +82,3 @@
= render 'projects/issues/discussion'
= render 'shared/issuable/sidebar', issuable: @issue
-
-= webpack_bundle_tag('common_vue')
-= webpack_bundle_tag('issue_show')
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 94ff39485fb..c22ad5939f9 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -63,7 +63,6 @@ var config = {
environments_folder: './environments/folder/environments_folder_bundle.js',
filtered_search: './filtered_search/filtered_search_bundle.js',
help: './help/help.js',
- issue_show: './issue_show/index.js',
locale: './locale/index.js',
main: './main.js',
merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js',
@@ -252,7 +251,6 @@ var config = {
'environments_folder',
'filtered_search',
'groups',
- 'issue_show',
'merge_conflicts',
'monitoring',
'notebook_viewer',