Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

3 files changed, 9 insertions, 6 deletions

diff --git a/app/graphql/types/design_management/design_collection_type.rb b/app/graphql/types/design_management/design_collection_type.rb
index 91978aa37b0..38864075288 100644
--- a/app/graphql/types/design_management/design_collection_type.rb
+++ b/app/graphql/types/design_management/design_collection_type.rb
@@ -9,9 +9,9 @@ module Types
       authorize :read_design
 
       field :issue, Types::IssueType, null: false,
-            description: 'Issue associated with the design collection.'
+                                      description: 'Issue associated with the design collection.'
       field :project, Types::ProjectType, null: false,
-            description: 'Project associated with the design collection.'
+                                          description: 'Project associated with the design collection.'
 
       field :designs,
             Types::DesignManagement::DesignType.connection_type,
diff --git a/app/graphql/types/design_management/design_fields.rb b/app/graphql/types/design_management/design_fields.rb
index c3a35cfe1ad..f9e9b270a36 100644
--- a/app/graphql/types/design_management/design_fields.rb
+++ b/app/graphql/types/design_management/design_fields.rb
@@ -13,7 +13,10 @@ module Types
       field :filename, GraphQL::Types::String, null: false, description: 'Filename of the design.'
       field :full_path, GraphQL::Types::String, null: false, description: 'Full path to the design file.'
       field :image, GraphQL::Types::String, null: false, extras: [:parent], description: 'URL of the full-sized image.'
-      field :image_v432x230, GraphQL::Types::String, null: true, extras: [:parent],
+      field :image_v432x230,
+            GraphQL::Types::String,
+            null: true,
+            extras: [:parent],
             description: 'The URL of the design resized to fit within the bounds of 432x230. ' \
                          'This will be `null` if the image has not been generated'
       field :diff_refs, Types::DiffRefsType,
diff --git a/app/graphql/types/design_management/version_type.rb b/app/graphql/types/design_management/version_type.rb
index cfd2b887dc3..2cbe50afae6 100644
--- a/app/graphql/types/design_management/version_type.rb
+++ b/app/graphql/types/design_management/version_type.rb
@@ -12,9 +12,9 @@ module Types
       authorize :read_design
 
       field :id, GraphQL::Types::ID, null: false,
-            description: 'ID of the design version.'
+                                     description: 'ID of the design version.'
       field :sha, GraphQL::Types::ID, null: false,
-            description: 'SHA of the design version.'
+                                      description: 'SHA of the design version.'
 
       field :designs,
             ::Types::DesignManagement::DesignType.connection_type,
@@ -35,7 +35,7 @@ module Types
 
       field :author, Types::UserType, null: false, description: 'Author of the version.'
       field :created_at, Types::TimeType, null: false,
-            description: 'Timestamp of when the version was created.'
+                                          description: 'Timestamp of when the version was created.'
     end
   end
 end