Merge branch 'dispatcher-mr-haml' into 'master'

Add dispatcher imports for bundles used in merge request show path

See merge request gitlab-org/gitlab-ce!17163

app/assets/javascripts/diff_notes/diff_notes_bundle.js

@@ -15,7 +15,7 @@ import './components/resolve_discussion_btn';
 import './components/diff_note_avatars';
 import './components/new_issue_for_discussion';
 
-$(() => {
+export default () => {
   const projectPathHolder = document.querySelector('.merge-request') || document.querySelector('.commit-box');
   const projectPath = projectPathHolder.dataset.projectPath;
   const COMPONENT_SELECTOR = 'resolve-btn, resolve-discussion-btn, jump-to-discussion, comment-and-resolve-btn, new-issue-for-discussion-btn';
@@ -75,4 +75,4 @@ $(() => {
   });
 
   $(window).trigger('resize.nav');
-});
+};

app/assets/javascripts/dispatcher.js

@@ -106,9 +106,6 @@ var Dispatcher;
             .catch(fail);
           break;
         case 'projects:merge_requests:show':
-          import('./pages/projects/merge_requests/show')
-            .then(callDefault)
-            .catch(fail);
           shortcut_handler = true;
           break;
         case 'dashboard:activity':

app/assets/javascripts/how_to_merge.js

-document.addEventListener('DOMContentLoaded', () => {
-  const modal = $('#modal_merge_info').modal({
-    modal: true,
-    show: false,
-  });
-  $('.how_to_merge_link').on('click', () => {
-    modal.show();
-  });
-  $('.modal-header .close').on('click', () => {
-    modal.hide();
-  });
-});
+export default () => {
+  const modal = $('#modal_merge_info');
+
+  if (modal) {
+    modal.modal({
+      modal: true,
+      show: false,
+    });
+
+    $('.how_to_merge_link').on('click', modal.show);
+    $('.modal-header .close').on('click', modal.hide);
+  }
+};

app/assets/javascripts/pages/projects/merge_requests/show/index.js

@@ -2,16 +2,19 @@ import MergeRequest from '~/merge_request';
 import ZenMode from '~/zen_mode';
 import initNotes from '~/init_notes';
 import initIssuableSidebar from '~/init_issuable_sidebar';
+import initDiffNotes from '~/diff_notes/diff_notes_bundle';
 import ShortcutsIssuable from '~/shortcuts_issuable';
 import Diff from '~/diff';
 import { handleLocationHash } from '~/lib/utils/common_utils';
+import howToMerge from '~/how_to_merge';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new Diff(); // eslint-disable-line no-new
   new ZenMode(); // eslint-disable-line no-new
 
-  initIssuableSidebar(); // eslint-disable-line no-new
-  initNotes(); // eslint-disable-line no-new
+  initIssuableSidebar();
+  initNotes();
+  initDiffNotes();
 
   const mrShowNode = document.querySelector('.merge-request');
 
@@ -21,4 +24,5 @@ export default () => {
 
   new ShortcutsIssuable(true); // eslint-disable-line no-new
   handleLocationHash();
-};
+  howToMerge();
+});

app/views/projects/merge_requests/_how_to_merge.html.haml

-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag('how_to_merge')
-
 #modal_merge_info.modal
   .modal-dialog
     .modal-content

app/views/projects/merge_requests/show.html.haml

@@ -6,7 +6,6 @@
 - page_card_attributes @merge_request.card_attributes
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag('common_vue')
-  = webpack_bundle_tag('diff_notes')
 
 .merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project) } }
   = render "projects/merge_requests/mr_title"

config/webpack.config.js

@@ -63,7 +63,6 @@ var config = {
     environments_folder:  './environments/folder/environments_folder_bundle.js',
     filtered_search:      './filtered_search/filtered_search_bundle.js',
     help:                 './help/help.js',
-    how_to_merge:         './how_to_merge.js',
     issue_show:           './issue_show/index.js',
     job_details:          './jobs/job_details_bundle.js',
     locale:               './locale/index.js',