diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-23 18:50:20 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-23 18:50:20 +0000 |
commit | 565e4ee5a6566057ee524963565f045bd1b2c51a (patch) | |
tree | 2507fa9e058f5342bfd6edf79ca0e8d24f262b20 | |
parent | e966c6aea25c78b7fd5ed65e7906b2317e15ac85 (diff) | |
parent | b817fb5cad7b2492d3fea3abedbcfd1797e66a68 (diff) | |
download | gitlab-ce-565e4ee5a6566057ee524963565f045bd1b2c51a.tar.gz |
Merge branch 'remove-issues-show' into 'master'
Remove issue_show webpack bundle
See merge request gitlab-org/gitlab-ce!17326
-rw-r--r-- | app/assets/javascripts/pages/projects/issues/show/index.js | 1 | ||||
-rw-r--r-- | app/views/projects/issues/show.html.haml | 3 | ||||
-rw-r--r-- | config/webpack.config.js | 2 |
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', |