Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-23 15:08:38 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-23 15:08:38 +0300
commit5ad0cf26551baff8f08af8562a8d45e6ec14d71a (patch)
tree57f1a6bad31bcd11efacd3fdfb9cc92f88fb6a86 /app/policies/project_policy.rb
parentf47c768fad17d4c876e96524f83f8306f071db66 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies/project_policy.rb')
-rw-r--r--app/policies/project_policy.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index 2789152e175..bbcb3c637a9 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -9,7 +9,7 @@ class ProjectPolicy < BasePolicy
merge_request
label
milestone
- project_snippet
+ snippet
wiki
note
pipeline
@@ -185,7 +185,7 @@ class ProjectPolicy < BasePolicy
enable :read_issue
enable :read_label
enable :read_milestone
- enable :read_project_snippet
+ enable :read_snippet
enable :read_project_member
enable :read_note
enable :create_project
@@ -208,7 +208,7 @@ class ProjectPolicy < BasePolicy
enable :download_code
enable :read_statistics
enable :download_wiki_code
- enable :create_project_snippet
+ enable :create_snippet
enable :update_issue
enable :reopen_issue
enable :admin_issue
@@ -286,8 +286,8 @@ class ProjectPolicy < BasePolicy
rule { can?(:maintainer_access) }.policy do
enable :admin_board
enable :push_to_delete_protected_branch
- enable :update_project_snippet
- enable :admin_project_snippet
+ enable :update_snippet
+ enable :admin_snippet
enable :admin_project_member
enable :admin_note
enable :admin_wiki
@@ -352,7 +352,7 @@ class ProjectPolicy < BasePolicy
end
rule { snippets_disabled }.policy do
- prevent(*create_read_update_admin_destroy(:project_snippet))
+ prevent(*create_read_update_admin_destroy(:snippet))
end
rule { wiki_disabled }.policy do
@@ -405,7 +405,7 @@ class ProjectPolicy < BasePolicy
enable :read_wiki
enable :read_label
enable :read_milestone
- enable :read_project_snippet
+ enable :read_snippet
enable :read_project_member
enable :read_merge_request
enable :read_note