diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-15 11:20:11 -0300 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-15 11:20:11 -0300 |
| commit | 35c9a75eff464ff7bb0e58c67488a6fa1bdebaaa (patch) | |
| tree | b78097fd10cad31f45b8b6613d45960f2872802c /app/models/project_feature.rb | |
| parent | 0112d13314e1aea350c7dacc02c0f1c527566809 (diff) | |
| parent | fe09c25d68a61c5874e9beb0f018c05a4d789d70 (diff) | |
| download | gitlab-ce-docs-topic-permissions.tar.gz | |
fix conflictdocs-topic-permissions
Diffstat (limited to 'app/models/project_feature.rb')
| -rw-r--r-- | app/models/project_feature.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project_feature.rb b/app/models/project_feature.rb index c8fabb16dc1..fb1db0255aa 100644 --- a/app/models/project_feature.rb +++ b/app/models/project_feature.rb @@ -55,7 +55,7 @@ class ProjectFeature < ActiveRecord::Base end def access_level(feature) - public_send(ProjectFeature.access_level_attribute(feature)) + public_send(ProjectFeature.access_level_attribute(feature)) # rubocop:disable GitlabSecurity/PublicSend end def builds_enabled? @@ -80,7 +80,7 @@ class ProjectFeature < ActiveRecord::Base # which cannot be higher than repository access level def repository_children_level validator = lambda do |field| - level = public_send(field) || ProjectFeature::ENABLED + level = public_send(field) || ProjectFeature::ENABLED # rubocop:disable GitlabSecurity/PublicSend not_allowed = level > repository_access_level self.errors.add(field, "cannot have higher visibility level than repository access level") if not_allowed end |