From d1231c63669f4bc3643985b9032de7f998612e08 Mon Sep 17 00:00:00 2001
From: Jason Pyeron <jpyeron@pdinc.us>
Date: Sun, 19 Aug 2012 21:35:52 -0400
Subject: [PATCH] fixed build to allow builds where a proxy is needed for access to outside resources see: http://ant.apache.org/manual/proxy.html
---
src/com/gitblit/wicket/pages/SummaryPage.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index cb507d2..2a624c2 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -136,6 +136,7 @@
if (getRepositoryModel().showReadme) {
String htmlText = null;
+ String markdownText = null;
String readme = null;
try {
RevCommit head = JGitUtils.getCommit(r, null);
@@ -158,11 +159,12 @@
}
if (!StringUtils.isEmpty(readme)) {
String [] encodings = GitBlit.getEncodings();
- String markdownText = JGitUtils.getStringContent(r, head.getTree(), readme, encodings);
+ markdownText = JGitUtils.getStringContent(r, head.getTree(), readme, encodings);
htmlText = MarkdownUtils.transformMarkdown(markdownText);
}
} catch (ParseException p) {
- error(p.getMessage());
+ markdownText = MessageFormat.format("<div class=\"alert alert-error\"><strong>{0}:</strong> {1}</div>{2}", getString("gb.error"), getString("gb.markdownFailure"), markdownText);
+ htmlText = StringUtils.breakLinesForHtml(markdownText);
}
Fragment fragment = new Fragment("readme", "markdownPanel");
fragment.add(new Label("readmeFile", readme));
--
Gitblit v1.9.1