diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-02-20 20:01:18 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-20 20:01:18 +0000 |
| commit | b48f7ec3b18534e6376103c348b1f3c0ad6b14a7 (patch) | |
| tree | 74ccb75b85915ef4867f157ffbffeddcd980a28e | |
| parent | 520f407250470b94161724355208cb4ca073746c (diff) | |
| download | gitlab-ce-b48f7ec3b18534e6376103c348b1f3c0ad6b14a7.tar.gz | |
Remove "notes" bundle from webpack config
| -rw-r--r-- | app/assets/javascripts/pages/projects/issues/show/index.js | 9 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 4 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/app/assets/javascripts/pages/projects/issues/show/index.js b/app/assets/javascripts/pages/projects/issues/show/index.js index da312c1f1b7..db064e3f801 100644 --- a/app/assets/javascripts/pages/projects/issues/show/index.js +++ b/app/assets/javascripts/pages/projects/issues/show/index.js @@ -1,13 +1,12 @@ -/* eslint-disable no-new */ - import initIssuableSidebar from '~/init_issuable_sidebar'; import Issue from '~/issue'; import ShortcutsIssuable from '~/shortcuts_issuable'; import ZenMode from '~/zen_mode'; +import '~/notes/index'; document.addEventListener('DOMContentLoaded', () => { - new Issue(); - new ShortcutsIssuable(); - new ZenMode(); + new Issue(); // eslint-disable-line no-new + new ShortcutsIssuable(); // eslint-disable-line no-new + new ZenMode(); // eslint-disable-line no-new initIssuableSidebar(); }); diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index b9dd4c27e63..91f68d8c419 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -5,10 +5,6 @@ - page_description @issue.description - page_card_attributes @issue.card_attributes -- content_for :page_specific_javascripts do - = webpack_bundle_tag 'common_vue' - = webpack_bundle_tag 'notes' - - can_update_issue = can?(current_user, :update_issue, @issue) - can_report_spam = @issue.submittable_as_spam_by?(current_user) diff --git a/config/webpack.config.js b/config/webpack.config.js index fe2111d1a5c..d4e9d271c3d 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -71,7 +71,6 @@ var config = { monitoring: './monitoring/monitoring_bundle.js', network: './network/network_bundle.js', notebook_viewer: './blob/notebook_viewer.js', - notes: './notes/index.js', pdf_viewer: './blob/pdf_viewer.js', pipelines: './pipelines/pipelines_bundle.js', pipelines_details: './pipelines/pipeline_details_bundle.js', @@ -259,7 +258,6 @@ var config = { 'merge_conflicts', 'monitoring', 'notebook_viewer', - 'notes', 'pdf_viewer', 'pipelines', 'pipelines_details', |