Add latest changes from gitlab-org/gitlab@master

app/workers/environments/auto_recover_worker.rb

@@ -4,6 +4,7 @@ module Environments
   class AutoRecoverWorker
     include ApplicationWorker
 
+    deduplicate :until_executed
     data_consistency :delayed
     idempotent!
     feature_category :continuous_delivery

config/feature_flags/development/increase_jira_import_issues_timeout.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429293
 milestone: '16.6'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true

db/docs/audit_events_external_audit_event_destinations.yml

@@ -7,4 +7,4 @@ feature_categories:
 description: TODO
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70706
 milestone: '14.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell

db/docs/audit_events_google_cloud_logging_configurations.yml

@@ -7,4 +7,4 @@ feature_categories:
 description: Stores Google Cloud Logging configurations associated with IAM service accounts, used for generating access tokens.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409421
 milestone: '16.0'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell

db/docs/protected_branch_merge_access_levels.yml

@@ -7,4 +7,4 @@ feature_categories:
 description: Stores merge access settings for protected branches
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081
 milestone: '8.11'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell

db/docs/protected_branch_push_access_levels.yml

@@ -7,4 +7,4 @@ feature_categories:
 description: Stores push access settings for protected branches
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081
 milestone: '8.11'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell

spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb

@@ -28,6 +28,8 @@ RSpec.describe 'cross-database foreign keys' do
       'namespace_commit_emails.user_id',          # https://gitlab.com/gitlab-org/gitlab/-/issues/429804
       'path_locks.user_id',                       # https://gitlab.com/gitlab-org/gitlab/-/issues/429380
       'project_authorizations.user_id',           # https://gitlab.com/gitlab-org/gitlab/-/issues/422044
+      'protected_branch_push_access_levels.user_id',  # https://gitlab.com/gitlab-org/gitlab/-/issues/431054
+      'protected_branch_merge_access_levels.user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/431055
       'security_orchestration_policy_configurations.bot_user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/429438
       'user_group_callouts.user_id'               # https://gitlab.com/gitlab-org/gitlab/-/issues/421287
     ]

spec/workers/environments/auto_recover_worker_spec.rb

@@ -20,6 +20,10 @@ RSpec.describe Environments::AutoRecoverWorker, feature_category: :continuous_de
     project.repository.add_branch(developer, 'review/feature', 'master')
   end
 
+  it 'has the `until_executed` deduplicate strategy' do
+    expect(described_class.get_deduplicate_strategy).to eq(:until_executed)
+  end
+
   context 'when environment has been updated recently' do
     it 'recovers the environment' do
       environment.stop!