diff options
| author | Michael Kozono <mkozono@gmail.com> | 2019-08-26 22:40:42 +0000 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2019-08-26 22:40:42 +0000 |
| commit | 452b5d605c7ef88c8385cb62afcfc78f45ea2d4c (patch) | |
| tree | 86a871fb97446df0061b6a8d3710b7affe8fab1d /app | |
| parent | 0f8058bc580ae09df71563c83fca2cc3ceb751fa (diff) | |
| parent | 6fa5f510e83a91e19a1601bf6c01a9cffe6fd5c9 (diff) | |
| download | gitlab-ce-452b5d605c7ef88c8385cb62afcfc78f45ea2d4c.tar.gz | |
Merge branch 'sh-guard-against-orphaned-project-feature' into 'master'
Guard against deleted project feature entry
Closes #66482
See merge request gitlab-org/gitlab-ce!32187
Diffstat (limited to 'app')
| -rw-r--r-- | app/policies/project_policy.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index b8dee1b0789..e2634692dc7 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -502,6 +502,8 @@ class ProjectPolicy < BasePolicy end def feature_available?(feature) + return false unless project.project_feature + case project.project_feature.access_level(feature) when ProjectFeature::DISABLED false |