diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-26 16:00:52 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-26 16:00:52 -0600 |
| commit | 2400c7bf4c3f69c46ce9c40b3c5c547b2e590dc5 (patch) | |
| tree | 130cb9ba883bd5cef7a3eddd3a4c86b9f0c4c1ac | |
| parent | 1553a34dbff167978f5dc81cc3a21e0b3b2b2bfa (diff) | |
| download | gitlab-ce-2400c7bf4c3f69c46ce9c40b3c5c547b2e590dc5.tar.gz | |
Remove diff notes webpack entry point
| -rw-r--r-- | app/assets/javascripts/pages/projects/commit/show/index.js | 2 | ||||
| -rw-r--r-- | app/views/projects/commit/show.html.haml | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/pages/projects/commit/show/index.js b/app/assets/javascripts/pages/projects/commit/show/index.js index 460a54ab504..1aeed197385 100644 --- a/app/assets/javascripts/pages/projects/commit/show/index.js +++ b/app/assets/javascripts/pages/projects/commit/show/index.js @@ -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(); }); diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml index 4058e61eb9a..ba86d943967 100644 --- a/app/views/projects/commit/show.html.haml +++ b/app/views/projects/commit/show.html.haml @@ -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" diff --git a/config/webpack.config.js b/config/webpack.config.js index 05389a2a93f..d0b17154978 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -55,7 +55,6 @@ var config = { common_vue: './vue_shared/vue_resource_interceptor.js', cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', - diff_notes: './diff_notes/diff_notes_bundle.js', environments: './environments/environments_bundle.js', environments_folder: './environments/folder/environments_folder_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js', @@ -247,7 +246,6 @@ var config = { 'commit_pipelines', 'cycle_analytics', 'deploy_keys', - 'diff_notes', 'environments', 'environments_folder', 'filtered_search', |