diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-02-28 01:51:12 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-02-28 01:51:12 +0300 |
commit | 94d5dd3b7bf5fb922458cec7659754164e8182c6 (patch) | |
tree | 4d00ce69d971e40a3a8288821bc7d7026da33fd5 | |
parent | 0be4a77d0012613f960c4177f53101c46de2899c (diff) |
remove merge_conflicts bundle in favor of pages directory entry point
5 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js b/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js index b92aef53510..233457ec61b 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js @@ -1,3 +1,4 @@ import initSidebarBundle from '~/sidebar/sidebar_bundle'; +import '~/merge_conflicts/merge_conflicts_bundle'; document.addEventListener('DOMContentLoaded', initSidebarBundle); diff --git a/app/assets/javascripts/pages/projects/merge_requests/conflicts/show/index.js b/app/assets/javascripts/pages/projects/merge_requests/conflicts/show/index.js deleted file mode 100644 index b92aef53510..00000000000 --- a/app/assets/javascripts/pages/projects/merge_requests/conflicts/show/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import initSidebarBundle from '~/sidebar/sidebar_bundle'; - -document.addEventListener('DOMContentLoaded', initSidebarBundle); diff --git a/app/views/projects/merge_requests/conflicts.html.haml b/app/views/projects/merge_requests/conflicts.html.haml index 2a2e57027be..a6e2565a485 100644 --- a/app/views/projects/merge_requests/conflicts.html.haml +++ b/app/views/projects/merge_requests/conflicts.html.haml @@ -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" diff --git a/app/views/projects/merge_requests/conflicts/show.html.haml b/app/views/projects/merge_requests/conflicts/show.html.haml index 2a2e57027be..a6e2565a485 100644 --- a/app/views/projects/merge_requests/conflicts/show.html.haml +++ b/app/views/projects/merge_requests/conflicts/show.html.haml @@ -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" diff --git a/config/webpack.config.js b/config/webpack.config.js index 613ed1cad03..20d398c41ea 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -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', |