Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 7 deletions

diff --git a/config/feature_flags/development/external_note_author_service_desk.yml b/config/feature_flags/development/raise_group_admin_package_permission_to_owner.yml
index bd5b5d9d350..7136e9e2ad0 100644
--- a/config/feature_flags/development/external_note_author_service_desk.yml
+++ b/config/feature_flags/development/raise_group_admin_package_permission_to_owner.yml
@@ -1,8 +1,8 @@
 ---
-name: external_note_author_service_desk
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117149
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408932
-milestone: '16.0'
+name: raise_group_admin_package_permission_to_owner
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118360
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409642
+milestone: '16.1'
 type: development
-group: group::respond
+group: group::package registry
 default_enabled: false
diff --git a/config/initializers/validate_database_config.rb b/config/initializers/validate_database_config.rb
index d381dbac2ed..d1fa9bb345d 100644
--- a/config/initializers/validate_database_config.rb
+++ b/config/initializers/validate_database_config.rb
@@ -10,11 +10,12 @@ if configurations = ActiveRecord::Base.configurations.configurations
       "The `main:` database needs to be defined as a first configuration item instead of `#{configurations.first.name}`."
   end
 
-  rejected_config_names = configurations.map(&:name).to_set - Gitlab::Database.all_database_names
+  all_database_names = Gitlab::Database.all_database_names
+  rejected_config_names = configurations.map(&:name).to_set - all_database_names
   if rejected_config_names.any?
     raise "ERROR: This installation of GitLab uses unsupported database names " \
       "in 'config/database.yml': #{rejected_config_names.to_a.join(", ")}. The only supported ones are " \
-      "#{Gitlab::Database.all_database_names.join(", ")}."
+      "#{all_database_names.join(", ")}."
   end
 
   replicas_config_names = configurations.select(&:replica?).map(&:name)