Add latest changes from gitlab-org/gitlab@master

12 files changed, 43 insertions, 6 deletions

diff --git a/db/docs/users.yml b/db/docs/users.yml
index 43bec30b9dd..f2c305ccc8d 100644
--- a/db/docs/users.yml
+++ b/db/docs/users.yml
@@ -13,3 +13,6 @@ schema_inconsistencies:
 - type: missing_indexes
   object_name: index_users_for_auditors
   introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138110
+- type: missing_indexes
+  object_name: index_users_on_id_and_last_activity_on_for_active_human_service
+  introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139230
diff --git a/db/migrate/20231130192752_add_options_to_elastic_reindexing_tasks.rb b/db/migrate/20231130192752_add_options_to_elastic_reindexing_tasks.rb
new file mode 100644
index 00000000000..3a94e6d600b
--- /dev/null
+++ b/db/migrate/20231130192752_add_options_to_elastic_reindexing_tasks.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddOptionsToElasticReindexingTasks < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  def change
+    add_column :elastic_reindexing_tasks, :options, :jsonb, null: false, default: {}
+  end
+end
diff --git a/db/post_migrate/20231016173129_queue_delete_invalid_protected_branch_merge_access_levels.rb b/db/post_migrate/20231016173129_queue_delete_invalid_protected_branch_merge_access_levels.rb
index 3f4009d783c..8d6173fc7ca 100644
--- a/db/post_migrate/20231016173129_queue_delete_invalid_protected_branch_merge_access_levels.rb
+++ b/db/post_migrate/20231016173129_queue_delete_invalid_protected_branch_merge_access_levels.rb
@@ -16,7 +16,6 @@ class QueueDeleteInvalidProtectedBranchMergeAccessLevels < Gitlab::Database::Mig
       :protected_branch_merge_access_levels,
       :id,
       job_interval: DELAY_INTERVAL,
-      queued_migration_version: '20231016173129',
       batch_size: BATCH_SIZE,
       sub_batch_size: SUB_BATCH_SIZE
     )
diff --git a/db/post_migrate/20231016194927_queue_delete_invalid_protected_branch_push_access_levels.rb b/db/post_migrate/20231016194927_queue_delete_invalid_protected_branch_push_access_levels.rb
index 6accaa3296b..32022ff8be0 100644
--- a/db/post_migrate/20231016194927_queue_delete_invalid_protected_branch_push_access_levels.rb
+++ b/db/post_migrate/20231016194927_queue_delete_invalid_protected_branch_push_access_levels.rb
@@ -16,7 +16,6 @@ class QueueDeleteInvalidProtectedBranchPushAccessLevels < Gitlab::Database::Migr
       :protected_branch_push_access_levels,
       :id,
       job_interval: DELAY_INTERVAL,
-      queued_migration_version: '20231016194927',
       batch_size: BATCH_SIZE,
       sub_batch_size: SUB_BATCH_SIZE
     )
diff --git a/db/post_migrate/20231016194943_queue_delete_invalid_protected_tag_create_access_levels.rb b/db/post_migrate/20231016194943_queue_delete_invalid_protected_tag_create_access_levels.rb
index 5880124d0a6..f96f1c3b380 100644
--- a/db/post_migrate/20231016194943_queue_delete_invalid_protected_tag_create_access_levels.rb
+++ b/db/post_migrate/20231016194943_queue_delete_invalid_protected_tag_create_access_levels.rb
@@ -15,7 +15,6 @@ class QueueDeleteInvalidProtectedTagCreateAccessLevels < Gitlab::Database::Migra
       :protected_tag_create_access_levels,
       :id,
       job_interval: DELAY_INTERVAL,
-      queued_migration_version: '20231016194943',
       batch_size: BATCH_SIZE,
       sub_batch_size: SUB_BATCH_SIZE
     )
diff --git a/db/post_migrate/20231030071209_queue_backfill_packages_tags_project_id.rb b/db/post_migrate/20231030071209_queue_backfill_packages_tags_project_id.rb
index 4984eb83263..1197e31dea8 100644
--- a/db/post_migrate/20231030071209_queue_backfill_packages_tags_project_id.rb
+++ b/db/post_migrate/20231030071209_queue_backfill_packages_tags_project_id.rb
@@ -16,7 +16,6 @@ class QueueBackfillPackagesTagsProjectId < Gitlab::Database::Migration[2.2]
       :packages_tags,
       :id,
       job_interval: DELAY_INTERVAL,
-      queued_migration_version: '20231030071209',
       batch_size: BATCH_SIZE,
       sub_batch_size: SUB_BATCH_SIZE
     )
diff --git a/db/post_migrate/20231114043522_queue_backfill_merge_request_diffs_project_id.rb b/db/post_migrate/20231114043522_queue_backfill_merge_request_diffs_project_id.rb
index 0dc15f5c56f..19448243fdc 100644
--- a/db/post_migrate/20231114043522_queue_backfill_merge_request_diffs_project_id.rb
+++ b/db/post_migrate/20231114043522_queue_backfill_merge_request_diffs_project_id.rb
@@ -15,7 +15,6 @@ class QueueBackfillMergeRequestDiffsProjectId < Gitlab::Database::Migration[2.2]
       :merge_request_diffs,
       :id,
       job_interval: DELAY_INTERVAL,
-      queued_migration_version: '20231114043522',
       batch_size: BATCH_SIZE,
       sub_batch_size: SUB_BATCH_SIZE
     )
diff --git a/db/post_migrate/20231201204712_requeue2_backfill_has_remediations_of_vulnerability_reads.rb b/db/post_migrate/20231201204712_requeue2_backfill_has_remediations_of_vulnerability_reads.rb
index e49a49d7912..35b6de08f10 100644
--- a/db/post_migrate/20231201204712_requeue2_backfill_has_remediations_of_vulnerability_reads.rb
+++ b/db/post_migrate/20231201204712_requeue2_backfill_has_remediations_of_vulnerability_reads.rb
@@ -22,7 +22,6 @@ class Requeue2BackfillHasRemediationsOfVulnerabilityReads < Gitlab::Database::Mi
       :vulnerability_reads,
       :vulnerability_id,
       job_interval: DELAY_INTERVAL,
-      queued_migration_version: '20231201204712',
       batch_size: BATCH_SIZE,
       sub_batch_size: SUB_BATCH_SIZE
     )
diff --git a/db/post_migrate/20231208103049_drop_index_users_on_id_and_last_activity.rb b/db/post_migrate/20231208103049_drop_index_users_on_id_and_last_activity.rb
new file mode 100644
index 00000000000..bf9b1800c68
--- /dev/null
+++ b/db/post_migrate/20231208103049_drop_index_users_on_id_and_last_activity.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class DropIndexUsersOnIdAndLastActivity < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  disable_ddl_transaction!
+
+  TABLE_NAME = :users
+  INDEX_NAME = :index_users_on_id_and_last_activity_on_for_active_human_service
+
+  def up
+    return unless should_run?
+
+    remove_concurrent_index_by_name TABLE_NAME, INDEX_NAME
+  end
+
+  def down
+    return unless should_run?
+
+    add_concurrent_index :users, [:id, :last_activity_on],
+      name: INDEX_NAME,
+      where: "state = 'active' AND user_type IN (0, 4)"
+  end
+
+  def should_run?
+    Gitlab.com_except_jh?
+  end
+end
diff --git a/db/schema_migrations/20231130192752 b/db/schema_migrations/20231130192752
new file mode 100644
index 00000000000..f5bbda5c8a1
--- /dev/null
+++ b/db/schema_migrations/20231130192752
@@ -0,0 +1 @@
+4777e51867476bd6c7b2a259866cf3453ef784f409ace94efd799de959288748
\ No newline at end of file
diff --git a/db/schema_migrations/20231208103049 b/db/schema_migrations/20231208103049
new file mode 100644
index 00000000000..f478c39466a
--- /dev/null
+++ b/db/schema_migrations/20231208103049
@@ -0,0 +1 @@
+a4c1bb4cdab6a0e9723849ec7dadf9fc8286cbd05c0b160c513fdbf727f6e0b6
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index cb9877ecb67..4f1aef9a8d0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -16345,6 +16345,7 @@ CREATE TABLE elastic_reindexing_tasks (
     max_slices_running smallint DEFAULT 60 NOT NULL,
     slice_multiplier smallint DEFAULT 2 NOT NULL,
     targets text[],
+    options jsonb DEFAULT '{}'::jsonb NOT NULL,
     CONSTRAINT check_7f64acda8e CHECK ((char_length(error_message) <= 255))
 );