Add latest changes from gitlab-org/security/gitlab@15-1-stable-ee

2 files changed, 18 insertions, 8 deletions

diff --git a/lib/bulk_imports/projects/graphql/get_project_query.rb b/lib/bulk_imports/projects/graphql/get_project_query.rb
index 76475893ac1..b3d7f3f4683 100644
--- a/lib/bulk_imports/projects/graphql/get_project_query.rb
+++ b/lib/bulk_imports/projects/graphql/get_project_query.rb
@@ -10,8 +10,20 @@ module BulkImports
           <<-'GRAPHQL'
           query($full_path: ID!) {
             project(fullPath: $full_path) {
+              description
               visibility
+              archived
               created_at: createdAt
+              shared_runners_enabled: sharedRunnersEnabled
+              container_registry_enabled: containerRegistryEnabled
+              only_allow_merge_if_pipeline_succeeds: onlyAllowMergeIfPipelineSucceeds
+              only_allow_merge_if_all_discussions_are_resolved: onlyAllowMergeIfAllDiscussionsAreResolved
+              request_access_enabled: requestAccessEnabled
+              printing_merge_request_link_enabled: printingMergeRequestLinkEnabled
+              remove_source_branch_after_merge: removeSourceBranchAfterMerge
+              autoclose_referenced_issues: autocloseReferencedIssues
+              suggestion_commit_message: suggestionCommitMessage
+              wiki_enabled: wikiEnabled
             }
           }
           GRAPHQL
diff --git a/lib/bulk_imports/projects/transformers/project_attributes_transformer.rb b/lib/bulk_imports/projects/transformers/project_attributes_transformer.rb
index 38730a7723b..24c55d8dbb1 100644
--- a/lib/bulk_imports/projects/transformers/project_attributes_transformer.rb
+++ b/lib/bulk_imports/projects/transformers/project_attributes_transformer.rb
@@ -7,18 +7,16 @@ module BulkImports
         PROJECT_IMPORT_TYPE = 'gitlab_project_migration'
 
         def transform(context, data)
-          project = {}
           entity = context.entity
           visibility = data.delete('visibility')
 
-          project[:name] = entity.destination_name
-          project[:path] = entity.destination_name.parameterize
-          project[:created_at] = data['created_at']
-          project[:import_type] = PROJECT_IMPORT_TYPE
-          project[:visibility_level] = Gitlab::VisibilityLevel.string_options[visibility] if visibility.present?
-          project[:namespace_id] = Namespace.find_by_full_path(entity.destination_namespace)&.id if entity.destination_namespace.present?
+          data['name'] = entity.destination_name
+          data['path'] = entity.destination_name.parameterize
+          data['import_type'] = PROJECT_IMPORT_TYPE
+          data['visibility_level'] = Gitlab::VisibilityLevel.string_options[visibility] if visibility.present?
+          data['namespace_id'] = Namespace.find_by_full_path(entity.destination_namespace)&.id if entity.destination_namespace.present?
 
-          project
+          data.transform_keys!(&:to_sym)
         end
       end
     end