remove merge_conflicts bundle in favor of pages directory entry point
This commit is contained in:
parent
0be4a77d00
commit
94d5dd3b7b
|
@ -1,3 +1,4 @@
|
|||
import initSidebarBundle from '~/sidebar/sidebar_bundle';
|
||||
import '~/merge_conflicts/merge_conflicts_bundle';
|
||||
|
||||
document.addEventListener('DOMContentLoaded', initSidebarBundle);
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
import initSidebarBundle from '~/sidebar/sidebar_bundle';
|
||||
|
||||
document.addEventListener('DOMContentLoaded', initSidebarBundle);
|
|
@ -1,7 +1,5 @@
|
|||
- page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
|
||||
- content_for :page_specific_javascripts do
|
||||
= webpack_bundle_tag('common_vue')
|
||||
= webpack_bundle_tag('merge_conflicts')
|
||||
= page_specific_javascript_tag('lib/ace.js')
|
||||
= render "projects/merge_requests/mr_title"
|
||||
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
- page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
|
||||
- content_for :page_specific_javascripts do
|
||||
= webpack_bundle_tag('common_vue')
|
||||
= webpack_bundle_tag('merge_conflicts')
|
||||
= page_specific_javascript_tag('lib/ace.js')
|
||||
= render "projects/merge_requests/mr_title"
|
||||
|
||||
|
|
|
@ -50,7 +50,6 @@ function generateEntries() {
|
|||
environments: './environments/environments_bundle.js',
|
||||
filtered_search: './filtered_search/filtered_search_bundle.js',
|
||||
help: './help/help.js',
|
||||
merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js',
|
||||
monitoring: './monitoring/monitoring_bundle.js',
|
||||
notebook_viewer: './blob/notebook_viewer.js',
|
||||
pdf_viewer: './blob/pdf_viewer.js',
|
||||
|
@ -241,7 +240,6 @@ var config = {
|
|||
'environments',
|
||||
'filtered_search',
|
||||
'groups',
|
||||
'merge_conflicts',
|
||||
'monitoring',
|
||||
'notebook_viewer',
|
||||
'pdf_viewer',
|
||||
|
|
Loading…
Reference in New Issue