diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-28 16:33:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-31 13:15:31 +0100 |
| commit | e35ecccb3012501ee30b72196aba2d096b4d3b92 (patch) | |
| tree | c4b38f535be74772664004389604ff49a4125cbf /app | |
| parent | cd7212ef69419202d90e11ca8032c2daf603910a (diff) | |
| download | gitlab-ce-e35ecccb3012501ee30b72196aba2d096b4d3b92.tar.gz | |
Merge branch '23872-members-of-group-that-has-project-access-getting-404-on-accessing-a-project-issue' into 'master'
Fix project member access for group links
Closes #23872.
See merge request !7144
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_team.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb index 79d041d2775..a6e911df9bd 100644 --- a/app/models/project_team.rb +++ b/app/models/project_team.rb @@ -125,14 +125,8 @@ class ProjectTeam max_member_access(user.id) == Gitlab::Access::MASTER end - def member?(user, min_member_access = nil) - member = !!find_member(user.id) - - if min_member_access - member && max_member_access(user.id) >= min_member_access - else - member - end + def member?(user, min_member_access = Gitlab::Access::GUEST) + max_member_access(user.id) >= min_member_access end def human_max_access(user_id) |