From e5227a46f4405dd8bfcc1582356f8e12d1e928c0 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mayer <jean-baptiste.mayer@m4x.org>
Date: Tue, 14 Apr 2015 17:33:02 -0400
Subject: [PATCH] Deny access to /com and /org folders in GO setup
---
src/main/java/com/gitblit/models/RepositoryModel.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/models/RepositoryModel.java b/src/main/java/com/gitblit/models/RepositoryModel.java
index 5bd2ec0..a81c622 100644
--- a/src/main/java/com/gitblit/models/RepositoryModel.java
+++ b/src/main/java/com/gitblit/models/RepositoryModel.java
@@ -88,6 +88,7 @@
public boolean acceptNewPatchsets;
public boolean acceptNewTickets;
public boolean requireApproval;
+ public String mergeTo;
public transient boolean isCollectingGarbage;
public Date lastGC;
@@ -181,9 +182,9 @@
public boolean isOwner(String username) {
if (StringUtils.isEmpty(username) || ArrayUtils.isEmpty(owners)) {
- return false;
+ return isUsersPersonalRepository(username);
}
- return owners.contains(username.toLowerCase());
+ return owners.contains(username.toLowerCase()) || isUsersPersonalRepository(username);
}
public boolean isPersonalRepository() {
--
Gitblit v1.9.1