diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-04 19:44:46 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-04 19:44:46 +0100 |
| commit | 59db98a0cabea4421434655d7f7873110363d21a (patch) | |
| tree | f3f72bca43724e230090aeae7aa0c15e56b707bf /app/policies | |
| parent | 5c80bbb33c12490bc5fa711642a40fc16bdb79a4 (diff) | |
| parent | 025015048f7eaad29ee7816c6040fb3e0c06eb8d (diff) | |
| download | gitlab-ce-59db98a0cabea4421434655d7f7873110363d21a.tar.gz | |
Merge dev master into GitLab.com master
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 |