diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-12-21 16:36:24 -0200 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2016-12-29 16:52:04 -0200 |
commit | f9963fe029122c9d7e866368b1fc1218e071f9d6 (patch) | |
tree | 7b2cabd842221156a9c947c693ee6b53c6616c88 /app/policies | |
parent | 7e88b242ce194958c6a59755eb434c17625c4395 (diff) | |
download | gitlab-ce-f9963fe029122c9d7e866368b1fc1218e071f9d6.tar.gz |
Parse JIRA issue references even if Issue Tracker is disabled
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/project_policy.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index b5db9c12622..e06818a0456 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -171,9 +171,7 @@ class ProjectPolicy < BasePolicy def disabled_features! repository_enabled = project.feature_available?(:repository, user) - unless project.feature_available?(:issues, user) - cannot!(*named_abilities(:issue)) - end + block_issues_abilities unless project.feature_available?(:merge_requests, user) && repository_enabled cannot!(*named_abilities(:merge_request)) @@ -250,6 +248,15 @@ class ProjectPolicy < BasePolicy ) end + def block_issues_abilities + unless project.feature_available?(:issues, user) + cannot! :read_issue if project.default_issues_tracker? + cannot! :create_issue + cannot! :update_issue + cannot! :admin_issue + end + end + def named_abilities(name) [ :"read_#{name}", |