Merge branch '235790-revert-js-initialization' into 'master'

Fix JS intialization on commit page

See merge request gitlab-org/gitlab!39695

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

@@ -18,20 +18,18 @@ import { __ } from '~/locale';
 document.addEventListener('DOMContentLoaded', () => {
   const hasPerfBar = document.querySelector('.with-performance-bar');
   const performanceHeight = hasPerfBar ? 35 : 0;
+  initChangesDropdown(document.querySelector('.navbar-gitlab').offsetHeight + performanceHeight);
+  new ZenMode();
+  new ShortcutsNavigation();
+  new MiniPipelineGraph({
+    container: '.js-commit-pipeline-graph',
+  }).bindEvents();
+  initNotes();
+  // eslint-disable-next-line no-jquery/no-load
+  $('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath);
+  fetchCommitMergeRequests();
+
   const filesContainer = $('.js-diffs-batch');
-  const initAfterPageLoad = () => {
-    new Diff();
-    new ZenMode();
-    new ShortcutsNavigation();
-    new MiniPipelineGraph({
-      container: '.js-commit-pipeline-graph',
-    }).bindEvents();
-    initNotes();
-    initChangesDropdown(document.querySelector('.navbar-gitlab').offsetHeight + performanceHeight);
-    // eslint-disable-next-line no-jquery/no-load
-    $('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath);
-    fetchCommitMergeRequests();
-  };
 
   if (filesContainer.length) {
     const batchPath = filesContainer.data('diffFilesPath');
@@ -42,12 +40,12 @@ document.addEventListener('DOMContentLoaded', () => {
         filesContainer.html($(data.html));
         syntaxHighlight(filesContainer);
         handleLocationHash();
-        initAfterPageLoad();
+        new Diff();
       })
       .catch(() => {
         flash(__('An error occurred while retrieving diff files'));
       });
   } else {
-    initAfterPageLoad();
+    new Diff();
   }
 });

spec/features/projects/commit/mini_pipeline_graph_spec.rb

@@ -26,8 +26,6 @@ RSpec.describe 'Mini Pipeline Graph in Commit View', :js do
       build.run
       visit project_commit_path(project, project.commit.id)
 
-      wait_for_all_requests
-
       expect(page).to have_selector('.mr-widget-pipeline-graph')
 
       first('.mini-pipeline-graph-dropdown-toggle').click