diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 18:06:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 18:06:07 +0300 |
| commit | 429d1abad29d379d8bc8f5219eb72384ad485deb (patch) | |
| tree | 5c8f9c96c203dbeb3e3e89f3979ce60453340f3f /app/policies | |
| parent | e464f195ff5debc3e9aad0f8c4537404b92019c6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/group_policy.rb | 5 | ||||
| -rw-r--r-- | app/policies/project_policy.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index 951a104122d..9e8ee3acf00 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -53,7 +53,10 @@ class GroupPolicy < BasePolicy enable :upload_file end - rule { admin }.enable :read_group + rule { admin }.policy do + enable :read_group + enable :update_max_artifacts_size + end rule { has_projects }.policy do enable :read_group diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index e6f8d1052ed..a3540f31077 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -137,6 +137,8 @@ class ProjectPolicy < BasePolicy # not. rule { guest | admin }.enable :read_project_for_iids + rule { admin }.enable :update_max_artifacts_size + rule { guest }.enable :guest_access rule { reporter }.enable :reporter_access rule { developer }.enable :developer_access |