diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-03-08 21:01:33 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-03-10 10:38:36 -0300 |
| commit | c3e70280dffe7ee0859ebd73b902d424ca5f809a (patch) | |
| tree | 06b83a5ab13d19803332253cf50a941501b29317 /app/models/ability.rb | |
| parent | bd59e59d01c5e845c7f7d451feaa1488670f20de (diff) | |
| download | gitlab-ce-c3e70280dffe7ee0859ebd73b902d424ca5f809a.tar.gz | |
Prevent projects to have higher visibility than groups
Prevent Groups to have smaller visibility than projects
Add default_group_visibility_level to configuration
Code improvements
Diffstat (limited to 'app/models/ability.rb')
| -rw-r--r-- | app/models/ability.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index ec5587d8fa5..1c9b15069aa 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -296,8 +296,7 @@ class Ability def can_read_group?(user, group) is_project_member = ProjectsFinder.new.execute(user, group: group).any? - internal_group_allowed = group.internal? && user.present? - user.admin? || group.users.include?(user) || is_project_member || group.public? || internal_group_allowed + user.admin? || group.public? || group.internal? || group.users.include?(user) end def namespace_abilities(user, namespace) |