From 16f0b684900bf73a5151d8c78ae0dbfc74e2a665 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 26 Feb 2017 12:40:51 +0900 Subject: [PATCH] (refs #1462)Rolled back a0c5414a93a4e99a786fa7bb770f6304571123d5 --- src/main/scala/gitbucket/core/service/RepositoryService.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/scala/gitbucket/core/service/RepositoryService.scala b/src/main/scala/gitbucket/core/service/RepositoryService.scala index 50b27471d..85d683203 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala @@ -397,6 +397,7 @@ trait RepositoryService { self: AccountService => loginAccount match { case Some(a) if(a.isAdmin) => true case Some(a) if(a.userName == owner) => true + case Some(a) if(getGroupMembers(owner).exists(_.userName == a.userName)) => true case Some(a) if(getCollaboratorUserNames(owner, repository, Seq(Role.ADMIN, Role.DEVELOPER)).contains(a.userName)) => true case _ => false } @@ -406,6 +407,7 @@ trait RepositoryService { self: AccountService => loginAccount match { case Some(a) if(a.isAdmin) => true case Some(a) if(a.userName == owner) => true + case Some(a) if(getGroupMembers(owner).exists(_.userName == a.userName)) => true case Some(a) if(getCollaboratorUserNames(owner, repository, Seq(Role.ADMIN, Role.DEVELOPER, Role.GUEST)).contains(a.userName)) => true case _ => false }