Commit 61c1509c authored by Nick Thomas's avatar Nick Thomas

Merge branch '58149-fix-read-list-board-policy' into 'master'

Allow `:read_list` when `:read_group` is allowed

Closes #58149

See merge request gitlab-org/gitlab-ce!25524
parents da8fce1f b81e7c52
...@@ -54,6 +54,7 @@ class GroupPolicy < BasePolicy ...@@ -54,6 +54,7 @@ class GroupPolicy < BasePolicy
rule { has_projects }.policy do rule { has_projects }.policy do
enable :read_group enable :read_group
enable :read_list
enable :read_label enable :read_label
end end
......
---
title: Fix error when viewing group issue boards when user doesn't have explicit group
permissions
merge_request: 25524
author:
type: fixed
...@@ -83,7 +83,7 @@ describe GroupPolicy do ...@@ -83,7 +83,7 @@ describe GroupPolicy do
end end
it do it do
expect_allowed(:read_group, :read_label) expect_allowed(:read_group, :read_list, :read_label)
end end
context 'in subgroups', :nested_groups do context 'in subgroups', :nested_groups do
...@@ -91,7 +91,7 @@ describe GroupPolicy do ...@@ -91,7 +91,7 @@ describe GroupPolicy do
let(:project) { create(:project, namespace: subgroup) } let(:project) { create(:project, namespace: subgroup) }
it do it do
expect_allowed(:read_group, :read_label) expect_allowed(:read_group, :read_list, :read_label)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment