Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

GITALY_SERVER_VERSION

@@ -1 +1 @@
-954816989a09915efa2cad385f92e53b25b01675
+d4daa7a154ccc86d1b57372e4265bb502c886537

app/models/concerns/cross_database_modification.rb

@@ -104,6 +104,8 @@ def gitlab_schema
         :gitlab_ci
       when 'MainClusterwide::ApplicationRecord'
         :gitlab_main_clusterwide
+      when 'PackageMetadata::ApplicationRecord'
+        :gitlab_pm
       else
         Gitlab::Database::GitlabSchema.table_schema(table_name) if table_name
       end

app/models/package_metadata/application_record.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module PackageMetadata
+  class ApplicationRecord < ::ApplicationRecord
+    self.abstract_class = true
+
+    def self.table_name_prefix
+      'pm_'
+    end
+  end
+end

app/services/merge_requests/refresh_service.rb

@@ -229,7 +229,7 @@ def comment_mr_branch_presence_changed(merge_request)
         :source, @push.branch_name, presence)
     end
 
-    # Add comment about pushing new commits to merge requests and send nofitication emails
+    # Add comment about pushing new commits to merge requests and send notification emails
     #
     def notify_about_push(merge_request)
       return unless @commits.present?

app/services/work_items/export_csv_service.rb

@@ -2,6 +2,14 @@
 
 module WorkItems
   class ExportCsvService < ExportCsv::BaseService
+    NotAvailableError = StandardError.new('This feature is currently behind a feature flag and it is not available.')
+
+    def csv_data
+      raise NotAvailableError unless Feature.enabled?(:import_export_work_items_csv, resource_parent)
+
+      super
+    end
+
     def email(mail_to_user)
       # TODO - will be implemented as part of https://gitlab.com/gitlab-org/gitlab/-/issues/379082
     end

config/feature_flags/development/import_export_work_items_csv.yml

@@ -0,0 +1,8 @@
+---
+name: import_export_work_items_csv
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111935
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390330
+milestone: '15.9'
+type: development
+group: group::certify
+default_enabled: false

config/feature_flags/ops/database_async_foreign_key_validation.yml

@@ -0,0 +1,8 @@
+---
+name: database_async_foreign_key_validation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112015
+rollout_issue_url:
+milestone: '15.9'
+type: ops
+group: group::database
+default_enabled: false

db/migrate/20230113195141_package_metadata_set_default_not_null.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class PackageMetadataSetDefaultNotNull < Gitlab::Database::Migration[2.1]
+  def change
+    change_column_null(:pm_package_versions, :pm_package_id, false)
+  end
+end

db/migrate/20230126023444_add_timestamps_to_package_metadata_tables.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddTimestampsToPackageMetadataTables < Gitlab::Database::Migration[2.1]
+  def up
+    add_timestamps_with_timezone(:pm_packages, null: false, default: -> { 'NOW()' })
+    add_timestamps_with_timezone(:pm_package_versions, null: false, default: -> { 'NOW()' })
+    add_timestamps_with_timezone(:pm_licenses, null: false, default: -> { 'NOW()' })
+    add_timestamps_with_timezone(:pm_package_version_licenses, null: false, default: -> { 'NOW()' })
+  end
+
+  def down
+    remove_timestamps(:pm_packages)
+    remove_timestamps(:pm_package_versions)
+    remove_timestamps(:pm_licenses)
+    remove_timestamps(:pm_package_version_licenses)
+  end
+end

db/migrate/20230127155217_add_id_column_to_package_metadata_join_table.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddIdColumnToPackageMetadataJoinTable < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  COMPOSITE_UNIQUE_INDEX = :i_pm_package_version_licenses_join_ids
+
+  def up
+    drop_constraint(:pm_package_version_licenses, :pm_package_version_licenses_pkey, cascade: true)
+    add_column(:pm_package_version_licenses, :id, :primary_key)
+    add_concurrent_index(:pm_package_version_licenses, [:pm_package_version_id, :pm_license_id], unique: true,
+      name: COMPOSITE_UNIQUE_INDEX)
+  end
+
+  def down
+    remove_column(:pm_package_version_licenses, :id)
+    add_primary_key_using_index(:pm_package_version_licenses, :pm_package_version_licenses_pkey, COMPOSITE_UNIQUE_INDEX)
+    remove_concurrent_index_by_name(:pm_package_version_licenses, COMPOSITE_UNIQUE_INDEX)
+  end
+end