diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-03-20 21:03:53 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-03-20 21:04:07 +0100 |
| commit | 8db1292139cfdac4c29c03b876b68b9e752cf75a (patch) | |
| tree | 2fcf67ada482ecf4ac90f39c858334a62b709618 /app/models/group.rb | |
| parent | 2eb19ea3ea36916bbea72a8ccab3e6d15f602ac9 (diff) | |
| download | gitlab-ce-8db1292139cfdac4c29c03b876b68b9e752cf75a.tar.gz | |
Tweaks, refactoring, and specs
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 17c69af4d1b..900fcd71ff3 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -83,16 +83,9 @@ class Group < Namespace end def visibility_level_allowed_by_projects - unless visibility_level_allowed? - level_name = Gitlab::VisibilityLevel.level_name(visibility_level).downcase - self.errors.add(:visibility_level, "#{level_name} is not allowed since there are projects with higher visibility.") - end - end - - def visibility_level_allowed? projects_visibility = self.projects.pluck(:visibility_level) - allowed_by_projects = projects_visibility.none? { |project_visibility| self.visibility_level < project_visibility } + allowed_by_projects = projects_visibility.all? { |project_visibility| self.visibility_level >= project_visibility } unless allowed_by_projects level_name = Gitlab::VisibilityLevel.level_name(visibility_level).downcase |