diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /app/models/work_item.rb | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'app/models/work_item.rb')
-rw-r--r-- | app/models/work_item.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/work_item.rb b/app/models/work_item.rb index 451359c1f85..05e45fa5b29 100644 --- a/app/models/work_item.rb +++ b/app/models/work_item.rb @@ -37,11 +37,11 @@ class WorkItem < Issue override :parent_link_confidentiality def parent_link_confidentiality if confidential? && work_item_children.public_only.exists? - errors.add(:confidential, _('confidential parent can not be used if there are non-confidential children.')) + errors.add(:base, _('A confidential work item cannot have a parent that already has non-confidential children.')) end if !confidential? && work_item_parent&.confidential? - errors.add(:confidential, _('associated parent is confidential and can not have non-confidential children.')) + errors.add(:base, _('A non-confidential work item cannot have a confidential parent.')) end end |