Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
fd65af9f39
commit
56702a6c99
|
|
@ -638,7 +638,9 @@ class Integration < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate_belongs_to_project_or_group
|
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
|
end
|
||||||
|
|
||||||
def validate_recipients?
|
def validate_recipients?
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue