From 8481ab5b01b2b848f05e43af345072921c2219b9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 02 Dec 2012 13:16:19 -0500
Subject: [PATCH] Do not prematurely reduce branches by maxCount when using branch permissions
---
src/com/gitblit/wicket/pages/RepositoryPage.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index 2bd1ec2..346edc3 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -115,7 +115,7 @@
boolean canAccess = user.hasBranchPermission(repositoryName,
branch.reference.getName());
if (!canAccess) {
- error(getString("gb.accessDeined"), true);
+ error(getString("gb.accessDenied"), true);
}
}
}
@@ -425,7 +425,7 @@
}
protected String getShortObjectId(String objectId) {
- return objectId.substring(0, 8);
+ return objectId.substring(0, GitBlit.getInteger(Keys.web.shortCommitIdLength, 6));
}
protected void addRefs(Repository r, RevCommit c) {
--
Gitblit v1.9.1