summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2012-12-03 16:55:19 -0500
committerJames Moger <james.moger@gitblit.com>2012-12-03 16:55:19 -0500
commit58d93319bd870c93d16764b86a4163ac2d1f0561 (patch)
tree7081b0cbfa305237c5311b8ee5189f9b0dc59780 /src
parentf1c3a882d12aede461e3c8ca3ebd298bdb28bc5d (diff)
downloadgitblit-58d93319bd870c93d16764b86a4163ac2d1f0561.tar.gz
gitblit-58d93319bd870c93d16764b86a4163ac2d1f0561.zip
Fixed branch view regression (issue-175)
Diffstat (limited to 'src')
-rw-r--r--src/com/gitblit/models/UserModel.java2
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) {