Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 17 insertions, 1 deletions

diff --git a/app/models/users/namespace_commit_email.rb b/app/models/users/namespace_commit_email.rb
index 4ec02f12717..883b17187ca 100644
--- a/app/models/users/namespace_commit_email.rb
+++ b/app/models/users/namespace_commit_email.rb
@@ -9,6 +9,22 @@ module Users
     validates :user, presence: true
     validates :namespace, presence: true
     validates :email, presence: true
-    validates :user_id, uniqueness: { scope: [:namespace_id] }
+    validates :user, uniqueness: { scope: :namespace_id }
+    validate :validate_root_group
+
+    def self.delete_for_namespace(namespace)
+      where(namespace: namespace).delete_all
+    end
+
+    private
+
+    def validate_root_group
+      # Due to the way Rails validations are invoked all at once,
+      # namespace sometimes won't exist when this is ran even though we have a validation for presence first.
+      return unless namespace&.group_namespace?
+      return if namespace.root?
+
+      errors.add(:namespace, _('must be a root group.'))
+    end
   end
 end