Merge branch 'remove-merge-conflicts-bundle' into 'master'
Remove merge_conflicts bundle See merge request gitlab-org/gitlab-ce!17408
This commit is contained in:
commit
4371f84564
6 changed files with 7 additions and 14 deletions
|
@ -12,7 +12,7 @@ import './components/inline_conflict_lines';
|
|||
import './components/parallel_conflict_lines';
|
||||
import syntaxHighlight from '../syntax_highlight';
|
||||
|
||||
$(() => {
|
||||
export default function initMergeConflicts() {
|
||||
const INTERACTIVE_RESOLVE_MODE = 'interactive';
|
||||
const conflictsEl = document.querySelector('#conflicts');
|
||||
const mergeConflictsStore = gl.mergeConflicts.mergeConflictsStore;
|
||||
|
@ -91,4 +91,4 @@ $(() => {
|
|||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
import initSidebarBundle from '~/sidebar/sidebar_bundle';
|
||||
import initMergeConflicts from '~/merge_conflicts/merge_conflicts_bundle';
|
||||
|
||||
document.addEventListener('DOMContentLoaded', initSidebarBundle);
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
initSidebarBundle();
|
||||
initMergeConflicts();
|
||||
});
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -44,13 +44,10 @@ function generateEntries() {
|
|||
|
||||
const manualEntries = {
|
||||
balsamiq_viewer: './blob/balsamiq_viewer.js',
|
||||
common: './commons/index.js',
|
||||
common_vue: './vue_shared/vue_resource_interceptor.js',
|
||||
cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js',
|
||||
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',
|
||||
mr_notes: './mr_notes/index.js',
|
||||
notebook_viewer: './blob/notebook_viewer.js',
|
||||
|
@ -242,7 +239,6 @@ var config = {
|
|||
'environments',
|
||||
'filtered_search',
|
||||
'groups',
|
||||
'merge_conflicts',
|
||||
'monitoring',
|
||||
'mr_notes',
|
||||
'notebook_viewer',
|
||||
|
|
Loading…
Reference in a new issue