Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 9 insertions, 11 deletions

diff --git a/app/services/design_management/generate_image_versions_service.rb b/app/services/design_management/generate_image_versions_service.rb
index 3ff239b59cc..0771ada72a1 100644
--- a/app/services/design_management/generate_image_versions_service.rb
+++ b/app/services/design_management/generate_image_versions_service.rb
@@ -69,17 +69,15 @@ module DesignManagement
     # The LFS pointer file data contains an "OID" that lets us retrieve `LfsObject`
     # records, which have an Uploader (`LfsObjectUploader`) for the original design file.
     def raw_files_by_path
-      @raw_files_by_path ||= begin
-        LfsObject.for_oids(blobs_by_oid.keys).each_with_object({}) do |lfs_object, h|
-          blob = blobs_by_oid[lfs_object.oid]
-          file = lfs_object.file.file
-          # The `CarrierWave::SanitizedFile` is loaded without knowing the `content_type`
-          # of the file, due to the file not having an extension.
-          #
-          # Set the content_type from the `Blob`.
-          file.content_type = blob.content_type
-          h[blob.path] = file
-        end
+      @raw_files_by_path ||= LfsObject.for_oids(blobs_by_oid.keys).each_with_object({}) do |lfs_object, h|
+        blob = blobs_by_oid[lfs_object.oid]
+        file = lfs_object.file.file
+        # The `CarrierWave::SanitizedFile` is loaded without knowing the `content_type`
+        # of the file, due to the file not having an extension.
+        #
+        # Set the content_type from the `Blob`.
+        file.content_type = blob.content_type
+        h[blob.path] = file
       end
     end