Add latest changes from gitlab-org/gitlab@master

2024-01-01 15:11:16 +00:00 · 2024-01-01 15:11:16 +00:00 · 56702a6c99
parent fd65af9f39
commit 56702a6c99
1 changed files with 3 additions and 1 deletions
--- a/app/models/integration.rb
+++ b/app/models/integration.rb
@ -638,7 +638,9 @@ class Integration < ApplicationRecord
  end

  def validate_belongs_to_project_or_group
-    errors.add(:project_id, 'The service cannot belong to both a project and a group') if project_level? && group_level?
+    return unless project_level? && group_level?
+
+    errors.add(:project_id, 'The integration cannot belong to both a project and a group')
  end

  def validate_recipients?