Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 0 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 03b247f213b..93ac9b64a98 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -107,6 +107,7 @@ class Project < ApplicationRecord
   after_update :update_forks_visibility_level
 
   before_destroy :remove_private_deploy_keys
+  before_destroy :cleanup_chat_names
 
   use_fast_destroy :build_trace_chunks
 
@@ -1908,6 +1909,17 @@ class Project < ApplicationRecord
     import_export_upload&.export_file
   end
 
+  # Before 12.9 we did not correctly clean up chat names and this causes issues.
+  # In 12.9, we add a foreign key relationship, but this code is used ensure the chat names are cleaned up while a post
+  # migration enables the foreign key relationship.
+  #
+  # This should be removed in 13.0.
+  #
+  # https://gitlab.com/gitlab-org/gitlab/issues/204787
+  def cleanup_chat_names
+    ChatName.where(service: services.select(:id)).delete_all
+  end
+
   def full_path_slug
     Gitlab::Utils.slugify(full_path.to_s)
   end