diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 00:09:12 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 00:09:12 +0000 |
commit | 0b881f91159cc97ccb7328a2e52977a60ea83fbe (patch) | |
tree | d6b683cb935112aee47121f46e3c5dc84de24f2c /app/policies | |
parent | 7671216b60e2796a050358ff808b4a0c2de3d22f (diff) | |
download | gitlab-ce-0b881f91159cc97ccb7328a2e52977a60ea83fbe.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/project_snippet_policy.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/policies/project_snippet_policy.rb b/app/policies/project_snippet_policy.rb index a38d9154102..869f4716298 100644 --- a/app/policies/project_snippet_policy.rb +++ b/app/policies/project_snippet_policy.rb @@ -31,7 +31,7 @@ class ProjectSnippetPolicy < BasePolicy ~can?(:read_all_resources)) end.prevent :read_snippet - rule { internal_snippet & ~is_author & ~admin }.policy do + rule { internal_snippet & ~is_author & ~admin & ~project.maintainer }.policy do prevent :update_snippet prevent :admin_snippet end @@ -42,7 +42,7 @@ class ProjectSnippetPolicy < BasePolicy prevent :admin_snippet end - rule { is_author | admin }.policy do + rule { is_author | admin | project.maintainer }.policy do enable :read_snippet enable :update_snippet enable :admin_snippet |