diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-04-02 18:30:49 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-10 15:46:20 +0200 |
| commit | 05732d90da0c556d6857bb4c1acd46d676dd07ba (patch) | |
| tree | d26527f4ca748fc65b7e178e61cbd6631d591e51 /app/policies | |
| parent | 9d220da84117220317ccff1421a394185fefe859 (diff) | |
| download | gitlab-ce-05732d90da0c556d6857bb4c1acd46d676dd07ba.tar.gz | |
Rename delete_protected_branch ability to push_to_delete_protected_branch to prevent confusion with destroy_protected_branch
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/project_policy.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index 21bb0934dee..b495132d693 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -208,7 +208,7 @@ class ProjectPolicy < BasePolicy end rule { can?(:master_access) }.policy do - enable :delete_protected_branch + enable :push_to_delete_protected_branch enable :update_project_snippet enable :update_environment enable :update_deployment @@ -232,8 +232,8 @@ class ProjectPolicy < BasePolicy rule { archived }.policy do prevent :create_merge_request + prevent :push_to_delete_protected_branch prevent :push_code - prevent :delete_protected_branch prevent :update_merge_request prevent :admin_merge_request end |