diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-19 07:35:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-19 07:35:27 +0000 |
| commit | 1f4911541d03a257c38a63c6aa36a1c7ca4c3b43 (patch) | |
| tree | a11861b212e1c2e3649ecf37c02e133f5988de1b /app | |
| parent | c5c62bddef54d77ec032a9b4ff7bd3448ff26595 (diff) | |
| parent | 5bfb6357ef4af408401f68a388ab4a1521af8903 (diff) | |
| download | gitlab-ce-1f4911541d03a257c38a63c6aa36a1c7ca4c3b43.tar.gz | |
Merge branch 'issue_32215' into 'master'
Allow DEVELOPER role to admin milestones
Closes #32215
See merge request gitlab-org/gitlab-ce!14257
Diffstat (limited to 'app')
| -rw-r--r-- | app/policies/group_policy.rb | 3 | ||||
| -rw-r--r-- | app/policies/project_policy.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index 420991ff6d6..8af9738d75c 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -9,6 +9,7 @@ class GroupPolicy < BasePolicy condition(:has_access) { access_level != GroupMember::NO_ACCESS } condition(:guest) { access_level >= GroupMember::GUEST } + condition(:developer) { access_level >= GroupMember::DEVELOPER } condition(:owner) { access_level >= GroupMember::OWNER } condition(:master) { access_level >= GroupMember::MASTER } condition(:reporter) { access_level >= GroupMember::REPORTER } @@ -33,11 +34,11 @@ class GroupPolicy < BasePolicy rule { admin } .enable :read_group rule { has_projects } .enable :read_group + rule { developer }.enable :admin_milestones rule { reporter }.enable :admin_label rule { master }.policy do enable :create_projects - enable :admin_milestones enable :admin_pipeline enable :admin_build end diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index a925fac7d3e..b7b5bd34189 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -155,6 +155,7 @@ class ProjectPolicy < BasePolicy rule { can?(:developer_access) }.policy do enable :admin_merge_request + enable :admin_milestone enable :update_merge_request enable :create_commit_status enable :update_commit_status @@ -178,7 +179,6 @@ class ProjectPolicy < BasePolicy enable :update_project_snippet enable :update_environment enable :update_deployment - enable :admin_milestone enable :admin_project_snippet enable :admin_project_member enable :admin_note |