diff options
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/group_policy.rb | 3 | ||||
-rw-r--r-- | app/policies/project_policy.rb | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index 298769c0eb8..2b0f1d25534 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -53,8 +53,11 @@ class GroupPolicy < BasePolicy rule { admin }.enable :read_group rule { has_projects }.policy do +<<<<<<< HEAD enable :read_group enable :read_list +======= +>>>>>>> dev/master enable :read_label end diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index 533782104ac..031b72ad9c3 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -300,6 +300,8 @@ class ProjectPolicy < BasePolicy rule { issues_disabled }.policy do prevent(*create_read_update_admin_destroy(:issue)) + prevent(*create_read_update_admin_destroy(:board)) + prevent(*create_read_update_admin_destroy(:list)) end rule { merge_requests_disabled | repository_disabled }.policy do |