Commit 5781f80e authored by Mike Greiling's avatar Mike Greiling

remove merge_conflicts bundle in favor of pages directory entry point

parent 4617a251
- page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests" - page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= webpack_bundle_tag('common_vue')
= webpack_bundle_tag('merge_conflicts')
= page_specific_javascript_tag('lib/ace.js') = page_specific_javascript_tag('lib/ace.js')
= render "projects/merge_requests/mr_title" = render "projects/merge_requests/mr_title"
......
- page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests" - page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= webpack_bundle_tag('common_vue')
= webpack_bundle_tag('merge_conflicts')
= page_specific_javascript_tag('lib/ace.js') = page_specific_javascript_tag('lib/ace.js')
= render "projects/merge_requests/mr_title" = render "projects/merge_requests/mr_title"
......
...@@ -55,7 +55,6 @@ function generateEntries() { ...@@ -55,7 +55,6 @@ function generateEntries() {
environments: './environments/environments_bundle.js', environments: './environments/environments_bundle.js',
filtered_search: './filtered_search/filtered_search_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js',
help: './help/help.js', help: './help/help.js',
merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js',
monitoring: './monitoring/monitoring_bundle.js', monitoring: './monitoring/monitoring_bundle.js',
notebook_viewer: './blob/notebook_viewer.js', notebook_viewer: './blob/notebook_viewer.js',
pdf_viewer: './blob/pdf_viewer.js', pdf_viewer: './blob/pdf_viewer.js',
...@@ -262,7 +261,6 @@ var config = { ...@@ -262,7 +261,6 @@ var config = {
'environments', 'environments',
'filtered_search', 'filtered_search',
'groups', 'groups',
'merge_conflicts',
'monitoring', 'monitoring',
'notebook_viewer', 'notebook_viewer',
'pdf_viewer', 'pdf_viewer',
......
import initSidebarBundle from 'ee/sidebar/sidebar_bundle'; import initSidebarBundle from 'ee/sidebar/sidebar_bundle';
import '~/merge_conflicts/merge_conflicts_bundle';
document.addEventListener('DOMContentLoaded', initSidebarBundle); document.addEventListener('DOMContentLoaded', initSidebarBundle);
import initSidebarBundle from 'ee/sidebar/sidebar_bundle';
document.addEventListener('DOMContentLoaded', initSidebarBundle);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment