From 553e0f79c99e3c3b6e7fb5364c10cfc1bd3b9c80 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sun, 04 May 2014 10:43:35 -0400 Subject: [PATCH] Stream directly from repo instead of loading into ram and streaming --- 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