summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-02-27 13:01:34 +0000
committerPhil Hughes <me@iamphill.com>2018-02-27 13:01:34 +0000
commit54d0f1bd71cad10b223db2aa2c98756d8ff88e50 (patch)
tree51efe48a982e2a79569d1f4831111dba2f976ec4 /app/assets
parent64b217bc07266932387cea26d710df79e7a915c5 (diff)
parent27ca41ac3c9442312f440d78f70628d0ac6826ff (diff)
downloadgitlab-ce-54d0f1bd71cad10b223db2aa2c98756d8ff88e50.tar.gz
Merge branch 'refactor-commit-show' into 'master'
Remove diff notes webpack entry point See merge request gitlab-org/gitlab-ce!17382
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/pages/projects/commit/show/index.js2
1 files changed, 2 insertions, 0 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();
});