diff options
| author | Rafael Cavazin <rafaelcavazin@gmail.com> | 2012-12-06 14:25:01 -0200 |
|---|---|---|
| committer | Rafael Cavazin <rafaelcavazin@gmail.com> | 2012-12-06 14:25:01 -0200 |
| commit | d4b95298902c8cea1411fc696ed80028b6091aa7 (patch) | |
| tree | 1ee58f481203ef60c030a3d0119784c37a8b7b3f /src/com/gitblit/models/UserModel.java | |
| parent | 6aea2fa8aee24114bc59b09bc3c5b68fcd948790 (diff) | |
| parent | dc9735acfc9dcea6b970d18a315cbf8a6997c4f9 (diff) | |
| download | gitblit-d4b95298902c8cea1411fc696ed80028b6091aa7.tar.gz gitblit-d4b95298902c8cea1411fc696ed80028b6091aa7.zip | |
Update from upstream/master
Merge remote-tracking branch 'upstream/master' into translation_to_pt-br
Diffstat (limited to 'src/com/gitblit/models/UserModel.java')
| -rw-r--r-- | src/com/gitblit/models/UserModel.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java index bd40985f..f1bc5efc 100644 --- a/src/com/gitblit/models/UserModel.java +++ b/src/com/gitblit/models/UserModel.java @@ -589,7 +589,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel> public boolean hasBranchPermission(String repositoryName, String branch) {
// Default UserModel doesn't implement branch-level security. Other Realms (i.e. Gerrit) may override this method.
- return hasRepositoryPermission(repositoryName);
+ return hasRepositoryPermission(repositoryName) || hasTeamRepositoryPermission(repositoryName);
}
public boolean isMyPersonalRepository(String repository) {
|