diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-28 12:10:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-28 12:10:15 +0300 |
commit | 25788905108838d95a62d7e3ad3ca16e6f6d0fda (patch) | |
tree | 72f4cb84b9ad509d4bda9aa838a751d123082708 /app/policies | |
parent | 5431dbfffcd7ae1cacc9b68b719b0e8fea29e6a4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/project_policy.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index 832b78bb9c3..3ba753ab60d 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -195,8 +195,6 @@ class ProjectPolicy < BasePolicy with_scope :subject condition(:packages_disabled) { !@subject.packages_enabled } - condition(:work_items_enabled, scope: :subject) { project&.work_items_feature_flag_enabled? } - features = %w[ merge_requests issues @@ -304,7 +302,7 @@ class ProjectPolicy < BasePolicy rule { can?(:create_issue) }.enable :create_work_item - rule { can?(:create_issue) & work_items_enabled }.enable :create_task + rule { can?(:create_issue) }.enable :create_task # These abilities are not allowed to admins that are not members of the project, # that's why they are defined separately. |