4 files changed, 10 insertions, 10 deletions
diff --git a/app/assets/javascripts/behaviors/autosize.js b/app/assets/javascripts/behaviors/autosize.js
index a5404539c17..181d841a068 100644
--- a/app/assets/javascripts/behaviors/autosize.js
+++ b/app/assets/javascripts/behaviors/autosize.js
@@ -1,13 +1,11 @@
 import Autosize from 'autosize';
 import { waitForCSSLoaded } from '~/helpers/startup_css_helper';
 
-document.addEventListener('DOMContentLoaded', () => {
-  waitForCSSLoaded(() => {
-    const autosizeEls = document.querySelectorAll('.js-autosize');
+waitForCSSLoaded(() => {
+  const autosizeEls = document.querySelectorAll('.js-autosize');
 
-    Autosize(autosizeEls);
-    Autosize.update(autosizeEls);
+  Autosize(autosizeEls);
+  Autosize.update(autosizeEls);
 
-    autosizeEls.forEach((el) => el.classList.add('js-autosize-initialized'));
-  });
+  autosizeEls.forEach((el) => el.classList.add('js-autosize-initialized'));
 });
diff --git a/app/graphql/types/base_enum.rb b/app/graphql/types/base_enum.rb
index cbd45b46dd6..4d470aceca4 100644
--- a/app/graphql/types/base_enum.rb
+++ b/app/graphql/types/base_enum.rb
@@ -21,7 +21,7 @@ module Types
         graphql_name(enum_mod.name) if use_name
         description(enum_mod.description) if use_description
 
-        enum_mod.definition.each { |key, content| value(key.to_s.upcase, content) }
+        enum_mod.definition.each { |key, content| value(key.to_s.upcase, **content) }
       end
 
       def value(*args, **kwargs, &block)
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 69a2efebb1f..4d748ac5bf8 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -254,7 +254,7 @@ module DiffHelper
   end
 
   def code_navigation_path(diffs)
-    Gitlab::CodeNavigationPath.new(merge_request.project, diffs.diff_refs&.head_sha)
+    Gitlab::CodeNavigationPath.new(merge_request.project, merge_request.diff_head_sha)
   end
 
   def conflicts
diff --git a/app/serializers/diffs_entity.rb b/app/serializers/diffs_entity.rb
index f573bbe8385..4bc6644a5cb 100644
--- a/app/serializers/diffs_entity.rb
+++ b/app/serializers/diffs_entity.rb
@@ -79,7 +79,9 @@ class DiffsEntity < Grape::Entity
   end
 
   expose :definition_path_prefix do |diffs|
-    project_blob_path(merge_request.project, diffs.diff_refs&.head_sha)
+    next unless merge_request.diff_head_sha
+
+    project_blob_path(merge_request.project, merge_request.diff_head_sha)
   end
 
   def merge_request