Merge branch 'refactor-commit-show' into 'master'
Remove diff notes webpack entry point See merge request gitlab-org/gitlab-ce!17382
This commit is contained in:
		
						commit
						54d0f1bd71
					
				|  | @ -5,6 +5,7 @@ import ShortcutsNavigation from '~/shortcuts_navigation'; | |||
| import MiniPipelineGraph from '~/mini_pipeline_graph_dropdown'; | ||||
| import initNotes from '~/init_notes'; | ||||
| import initChangesDropdown from '~/init_changes_dropdown'; | ||||
| import initDiffNotes from '~/diff_notes/diff_notes_bundle'; | ||||
| import { fetchCommitMergeRequests } from '~/commit_merge_requests'; | ||||
| 
 | ||||
| document.addEventListener('DOMContentLoaded', () => { | ||||
|  | @ -19,4 +20,5 @@ document.addEventListener('DOMContentLoaded', () => { | |||
|   initChangesDropdown(document.querySelector('.navbar-gitlab').offsetHeight - stickyBarPaddingTop); | ||||
|   $('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath); | ||||
|   fetchCommitMergeRequests(); | ||||
|   initDiffNotes(); | ||||
| }); | ||||
|  |  | |||
|  | @ -8,7 +8,6 @@ | |||
| - page_description  @commit.description | ||||
| - content_for :page_specific_javascripts do | ||||
|   = webpack_bundle_tag('common_vue') | ||||
|   = webpack_bundle_tag('diff_notes') | ||||
| 
 | ||||
| .container-fluid{ class: [limited_container_width, container_class] } | ||||
|   = render "commit_box" | ||||
|  |  | |||
|  | @ -48,7 +48,6 @@ var config = { | |||
|     common:               './commons/index.js', | ||||
|     common_vue:           './vue_shared/vue_resource_interceptor.js', | ||||
|     cycle_analytics:      './cycle_analytics/cycle_analytics_bundle.js', | ||||
|     diff_notes:           './diff_notes/diff_notes_bundle.js', | ||||
|     environments:         './environments/environments_bundle.js', | ||||
|     filtered_search:      './filtered_search/filtered_search_bundle.js', | ||||
|     help:                 './help/help.js', | ||||
|  | @ -235,7 +234,6 @@ var config = { | |||
|         'boards', | ||||
|         'cycle_analytics', | ||||
|         'deploy_keys', | ||||
|         'diff_notes', | ||||
|         'environments', | ||||
|         'filtered_search', | ||||
|         'groups', | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue