Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 4 deletions

diff --git a/lib/api/unleash.rb b/lib/api/unleash.rb
index b2133dc743a..ae84c6c7010 100644
--- a/lib/api/unleash.rb
+++ b/lib/api/unleash.rb
@@ -33,13 +33,11 @@ module API
             present_feature_flags
           end
 
-          # We decrease the urgency of this endpoint until the maxmemory issue of redis-cache has been resolved.
-          # See https://gitlab.com/gitlab-org/gitlab/-/issues/365575#note_1033611872 for more information.
           desc 'Get a list of features' do
             is_array true
             tags unleash_tags
           end
-          get 'client/features', urgency: :low do
+          get 'client/features', urgency: :medium do
             present_feature_flags
           end
 
diff --git a/lib/gitlab/database/partitioning.rb b/lib/gitlab/database/partitioning.rb
index 6314aff9914..4a9e002a1a2 100644
--- a/lib/gitlab/database/partitioning.rb
+++ b/lib/gitlab/database/partitioning.rb
@@ -37,8 +37,9 @@ module Gitlab
             models_to_sync.each do |model|
               next if model < ::Gitlab::Database::SharedModel && !(model < TableWithoutModel)
 
+              model_connection_name = model.connection_db_config.name
               Gitlab::Database::EachDatabase.each_database_connection do |connection, connection_name|
-                if connection_name != model.connection_db_config.name
+                if connection_name != model_connection_name
                   PartitionManager.new(model, connection: connection).sync_partitions
                 end
               end