Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

Gemfile

@@ -113,7 +113,7 @@ gem 'browser', '~> 5.3.1'
 gem 'ohai', '~> 17.9'
 
 # GPG
-gem 'gpgme', '~> 2.0.22'
+gem 'gpgme', '~> 2.0.23'
 
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
@@ -493,7 +493,7 @@ group :test do
   # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
   gem 'derailed_benchmarks', require: false
 
-  gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false
+  gem 'gitlab_quality-test_tooling', '~> 1.0.0', require: false
 end
 
 gem 'octokit', '~> 6.0'

Gemfile.checksum

@@ -219,7 +219,7 @@
 {"name":"gitlab-styles","version":"10.1.0","platform":"ruby","checksum":"f42745f5397d042fe24cf2d0eb56c995b37f9f43d8fb79b834d197a1cafdc84a"},
 {"name":"gitlab_chronic_duration","version":"0.11.0","platform":"ruby","checksum":"c2fd201724a9031ff0af23d07a30231cebefbf83c3e682daae452cda5f514ba6"},
 {"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"},
-{"name":"gitlab_quality-test_tooling","version":"0.9.3","platform":"ruby","checksum":"9751f3504b717499588bd0fa5517de9b6756e8b9548777ea0283b889694580f0"},
+{"name":"gitlab_quality-test_tooling","version":"1.0.0","platform":"ruby","checksum":"b030be168a6a0eb3c47202beb6c64a4fbe36f5547d189c3f64cad29cfcc331db"},
 {"name":"globalid","version":"1.1.0","platform":"ruby","checksum":"b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f"},
 {"name":"gon","version":"6.4.0","platform":"ruby","checksum":"e3a618d659392890f1aa7db420f17c75fd7d35aeb5f8fe003697d02c4b88d2f0"},
 {"name":"google-apis-androidpublisher_v3","version":"0.34.0","platform":"ruby","checksum":"d7e1d7dd92f79c498fe2082222a1740d788e022e660c135564b3fd299cab5425"},
@@ -255,7 +255,7 @@
 {"name":"googleapis-common-protos","version":"1.4.0","platform":"ruby","checksum":"da2380fb5ab1563580816c74e8d684ac17512c3654c829a3ee84f6d6139de382"},
 {"name":"googleapis-common-protos-types","version":"1.5.0","platform":"ruby","checksum":"5769cf7376abc86ef7f5897a4aaca1d5c5a3c49ddabeddd2c251fcf8155f858b"},
 {"name":"googleauth","version":"1.3.0","platform":"ruby","checksum":"51dd7362353cf1e90a2d01e1fb94321ae3926c776d4dc4a79db65230217ffcc2"},
-{"name":"gpgme","version":"2.0.22","platform":"ruby","checksum":"7c6904952afdd0bf2c7c3ed6de98a5143f86c6b7390dbcd9d7012bddfa3ec862"},
+{"name":"gpgme","version":"2.0.23","platform":"ruby","checksum":"c87bbafdb8719da7c58ebcac08297aa1fb227022ac6cd2972829ba68adc91c04"},
 {"name":"grape","version":"1.7.1","platform":"ruby","checksum":"6b679d8918ee3dc19b0da95a5069dc95a71a15cf5788f5f787bb2ededf58cbb6"},
 {"name":"grape-entity","version":"0.10.0","platform":"ruby","checksum":"9aed1e7cbbc96d9e73f72e5f32c776d4ba8a5baf54c3acda2682008dba2b2cfe"},
 {"name":"grape-path-helpers","version":"1.7.1","platform":"ruby","checksum":"2e27271a20d4073e3a3b2b955425c7f803e198be3ba8f6e59e3d59643c5381e2"},

Gemfile.lock

@@ -685,7 +685,7 @@ GEM
       omniauth (>= 1.3, < 3)
       pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
       rubyntlm (~> 0.5)
-    gitlab_quality-test_tooling (0.9.3)
+    gitlab_quality-test_tooling (1.0.0)
       activesupport (>= 6.1, < 7.1)
       gitlab (~> 4.19)
       http (~> 5.0)
@@ -769,7 +769,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    gpgme (2.0.22)
+    gpgme (2.0.23)
       mini_portile2 (~> 2.7)
     grape (1.7.1)
       activesupport
@@ -1834,7 +1834,7 @@ DEPENDENCIES
   gitlab-utils!
   gitlab_chronic_duration (~> 0.11)
   gitlab_omniauth-ldap (~> 2.2.0)
-  gitlab_quality-test_tooling (~> 0.9.3)
+  gitlab_quality-test_tooling (~> 1.0.0)
   gon (~> 6.4.0)
   google-apis-androidpublisher_v3 (~> 0.34.0)
   google-apis-cloudbilling_v1 (~> 0.21.0)
@@ -1848,7 +1848,7 @@ DEPENDENCIES
   google-apis-sqladmin_v1beta4 (~> 0.41.0)
   google-cloud-storage (~> 1.44.0)
   google-protobuf (~> 3.24, >= 3.24.3)
-  gpgme (~> 2.0.22)
+  gpgme (~> 2.0.23)
   grape (~> 1.7.1)
   grape-entity (~> 0.10.0)
   grape-path-helpers (~> 1.7.1)

app/models/concerns/cross_database_ignored_tables.rb

@@ -4,6 +4,12 @@ module CrossDatabaseIgnoredTables
   extend ActiveSupport::Concern
 
   class_methods do
+    def temporary_ignore_cross_database_tables(tables, url:, &blk)
+      Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.temporary_ignore_tables_in_transaction(
+        tables, url: url, &blk
+      )
+    end
+
     def cross_database_ignore_tables(tables, options = {})
       raise "missing issue url" if options[:url].blank?
 
@@ -40,8 +46,7 @@ def temporary_ignore_cross_database_tables(tables, options, &blk)
     return yield unless options[:if].nil? || instance_eval(&options[:if])
 
     url = options[:url]
-    Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.temporary_ignore_tables_in_transaction(
-      tables, url: url, &blk
-    )
+
+    self.class.temporary_ignore_cross_database_tables(tables, url: url, &blk)
   end
 end

app/models/concerns/storage/legacy_namespace.rb

@@ -17,8 +17,6 @@ def move_dir
                      Namespace.find(parent_id_before_last_save) # raise NotFound early if needed
                    end
 
-      move_repositories
-
       if saved_change_to_parent?
         former_parent_full_path = parent_was&.full_path
         parent_full_path = parent&.full_path

app/models/members/group_member.rb

@@ -9,7 +9,6 @@ class GroupMember < Member
 
   belongs_to :group, foreign_key: 'source_id'
   alias_attribute :namespace_id, :source_id
-  delegate :update_two_factor_requirement, to: :user, allow_nil: true
 
   # Make sure group member points only to group as it source
   attribute :source_type, default: SOURCE_TYPE
@@ -26,6 +25,16 @@ class GroupMember < Member
 
   attr_accessor :last_owner
 
+  def update_two_factor_requirement
+    return unless user
+
+    Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.temporary_ignore_tables_in_transaction(
+      %w[users user_details user_preferences], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424288'
+    ) do
+      user.update_two_factor_requirement
+    end
+  end
+
   # For those who get to see a modal with a role dropdown, here are the options presented
   def self.permissible_access_level_roles(_, _)
     # This method is a stopgap in preparation for https://gitlab.com/gitlab-org/gitlab/-/issues/364087

app/models/namespace.rb

@@ -17,6 +17,9 @@ class Namespace < ApplicationRecord
   include BlocksUnsafeSerialization
   include Ci::NamespaceSettings
   include Referable
+  include CrossDatabaseIgnoredTables
+
+  cross_database_ignore_tables %w[routes redirect_routes], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424277'
 
   # Tells ActiveRecord not to store the full class name, in order to save some space
   # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69794
@@ -145,7 +148,6 @@ class Namespace < ApplicationRecord
   after_update :force_share_with_group_lock_on_descendants, if: -> { saved_change_to_share_with_group_lock? && share_with_group_lock? }
   after_update :expire_first_auto_devops_config_cache, if: -> { saved_change_to_auto_devops_enabled? }
   after_update :move_dir, if: :saved_change_to_path_or_parent?, unless: -> { is_a?(Namespaces::ProjectNamespace) }
-  after_destroy :rm_dir
 
   after_save :reload_namespace_details
 
@@ -155,7 +157,6 @@ class Namespace < ApplicationRecord
 
   # Legacy Storage specific hooks
 
-  before_destroy(prepend: true) { prepare_for_destroy }
   after_commit :expire_child_caches, on: :update, if: -> {
     Feature.enabled?(:cached_route_lookups, self, type: :ops) &&
       saved_change_to_name? || saved_change_to_path? || saved_change_to_parent_id?

app/models/namespace/traversal_hierarchy.rb

@@ -39,9 +39,16 @@ def sync_traversal_ids!
           AND namespaces.traversal_ids::bigint[] <> cte.traversal_ids
       SQL
 
-      Namespace.transaction do
-        @root.lock!("FOR NO KEY UPDATE")
-        Namespace.connection.exec_query(sql)
+      # Hint: when a user is created, it also creates a Namespaces::UserNamespace in
+      # `ensure_namespace_correct`. This method is then called within the same
+      # transaction of the user INSERT.
+      Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.temporary_ignore_tables_in_transaction(
+        %w[namespaces], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424279'
+      ) do
+        Namespace.transaction do
+          @root.lock!("FOR NO KEY UPDATE")
+          Namespace.connection.exec_query(sql)
+        end
       end
     rescue ActiveRecord::Deadlocked
       db_deadlock_counter.increment(source: 'Namespace#sync_traversal_ids!')

app/models/project.rb

@@ -44,9 +44,12 @@ class Project < ApplicationRecord
   include IssueParent
   include UpdatedAtFilterable
   include IgnorableColumns
+  include CrossDatabaseIgnoredTables
 
   ignore_column :emails_disabled, remove_with: '16.3', remove_after: '2023-08-22'
 
+  cross_database_ignore_tables %w[routes redirect_routes], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424277'
+
   extend Gitlab::Cache::RequestCache
   extend Gitlab::Utils::Override
 

app/models/user.rb

@@ -30,6 +30,7 @@ class User < MainClusterwide::ApplicationRecord
   include RestrictedSignup
   include StripAttribute
   include EachBatch
+  include CrossDatabaseIgnoredTables
   include IgnorableColumns
 
   ignore_column %i[
@@ -39,6 +40,19 @@ class User < MainClusterwide::ApplicationRecord
     email_opted_in_at
   ], remove_with: '16.6', remove_after: '2023-10-22'
 
+  # `ensure_namespace_correct` needs to be moved to an after_commit (?)
+  cross_database_ignore_tables %w[namespaces namespace_settings], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424279'
+
+  # `notification_settings_for` is called, and elsewhere `save` is then called.
+  cross_database_ignore_tables %w[notification_settings], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424284'
+
+  # Associations with dependent: option
+  cross_database_ignore_tables(
+    %w[namespaces projects project_authorizations issues merge_requests merge_requests issues issues merge_requests],
+    url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424285',
+    on: :destroy
+  )
+
   DEFAULT_NOTIFICATION_LEVEL = :participating
 
   INSTANCE_ACCESS_REQUEST_APPROVERS_TO_BE_NOTIFIED_LIMIT = 10
@@ -348,7 +362,9 @@ def update_tracked_fields!(request)
         email_to_confirm.confirm
       end
     else
-      add_primary_email_to_emails!
+      ignore_cross_database_tables_if_factory_bot(%w[emails]) do
+        add_primary_email_to_emails!
+      end
     end
   end
   after_commit(on: :update) do
@@ -503,11 +519,19 @@ def blocked?
     end
 
     after_transition any => :active do |user|
-      user.starred_projects.update_counters(star_count: 1)
+      user.class.temporary_ignore_cross_database_tables(
+        %w[projects], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424278'
+      ) do
+        user.starred_projects.update_counters(star_count: 1)
+      end
     end
 
     after_transition active: any do |user|
-      user.starred_projects.update_counters(star_count: -1)
+      user.class.temporary_ignore_cross_database_tables(
+        %w[projects], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424278'
+      ) do
+        user.starred_projects.update_counters(star_count: -1)
+      end
     end
   end