Merge branch 'remove-notes-bundle' into 'master'
Remove "notes" bundle from webpack config See merge request gitlab-org/gitlab-ce!17230
This commit is contained in:
commit
6844a2df87
|
@ -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();
|
||||
});
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Reference in New Issue