diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-27 16:01:34 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-27 16:01:34 +0300 |
| commit | 54d0f1bd71cad10b223db2aa2c98756d8ff88e50 (patch) | |
| tree | 51efe48a982e2a79569d1f4831111dba2f976ec4 /app | |
| parent | 64b217bc07266932387cea26d710df79e7a915c5 (diff) | |
| parent | 27ca41ac3c9442312f440d78f70628d0ac6826ff (diff) | |
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')
| -rw-r--r-- | app/assets/javascripts/pages/projects/commit/show/index.js | 2 | ||||
| -rw-r--r-- | app/views/projects/commit/show.html.haml | 1 |
2 files changed, 2 insertions, 1 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" |