Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-02-27 14:53:44 +0300
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-03-11 16:04:21 +0300
commit5995ff9713fb86eac729f5bf929fb0ab93f5a77c (patch)
tree5bbfd7e710dc1ce173d7efddedcc6adb20f8a513
parentfbe2f04a91a50b256f94fd94ea8f2a9d460afb00 (diff)
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 (cherry picked from commit 61c1509cc992959ac5021d10825d5dbf9dd2c091) b81e7c52 Enable `:read_list` when `:read_group` is enabled
-rw-r--r--app/policies/group_policy.rb1
-rw-r--r--changelogs/unreleased/58149-fix-read-list-board-policy.yml6
-rw-r--r--spec/policies/group_policy_spec.rb4
3 files changed, 9 insertions, 2 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb
index c25766a5af8..298769c0eb8 100644
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -54,6 +54,7 @@ class GroupPolicy < BasePolicy
rule { has_projects }.policy do
enable :read_group
+ enable :read_list
enable :read_label
end
diff --git a/changelogs/unreleased/58149-fix-read-list-board-policy.yml b/changelogs/unreleased/58149-fix-read-list-board-policy.yml
new file mode 100644
index 00000000000..964813f4c9a
--- /dev/null
+++ b/changelogs/unreleased/58149-fix-read-list-board-policy.yml
@@ -0,0 +1,6 @@
+---
+title: Fix error when viewing group issue boards when user doesn't have explicit group
+ permissions
+merge_request: 25524
+author:
+type: fixed
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index be1804c5ce0..af6d6f084a9 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -83,7 +83,7 @@ describe GroupPolicy do
end
it do
- expect_allowed(:read_group, :read_label)
+ expect_allowed(:read_group, :read_list, :read_label)
end
context 'in subgroups', :nested_groups do
@@ -91,7 +91,7 @@ describe GroupPolicy do
let(:project) { create(:project, namespace: subgroup) }
it do
- expect_allowed(:read_group, :read_label)
+ expect_allowed(:read_group, :read_list, :read_label)
end
end
end