From e09d4bb6558c7b6c59dec3911138aaaa2a0f4597 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 15 Jun 2012 08:26:19 -0400
Subject: [PATCH] Fixed bug where Manager could not update unreferenced setting (issue 85)
---
src/com/gitblit/wicket/pages/SummaryPage.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index 12371f7..ef2ee55 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -89,7 +89,7 @@
add(new Label("branchStats", ""));
} else {
add(new Label("branchStats",
- MessageFormat.format("{0} commits and {1} tags in {2}", metricsTotal.count,
+ MessageFormat.format(getString("gb.branchStats"), metricsTotal.count,
metricsTotal.tag, TimeUtils.duration(metricsTotal.duration))));
}
add(new BookmarkablePageLink<Void>("metrics", MetricsPage.class,
@@ -158,7 +158,8 @@
}
}
if (!StringUtils.isEmpty(readme)) {
- String markdownText = JGitUtils.getStringContent(r, head.getTree(), readme);
+ String [] encodings = GitBlit.getEncodings();
+ String markdownText = JGitUtils.getStringContent(r, head.getTree(), readme, encodings);
htmlText = MarkdownUtils.transformMarkdown(markdownText);
}
} catch (ParseException p) {
@@ -188,7 +189,7 @@
&& GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) {
IChartData data = WicketUtils.getChartData(metrics);
- ChartProvider provider = new ChartProvider(new Dimension(400, 100), ChartType.LINE,
+ ChartProvider provider = new ChartProvider(new Dimension(290, 100), ChartType.LINE,
data);
ChartAxis dateAxis = new ChartAxis(ChartAxisType.BOTTOM);
dateAxis.setLabels(new String[] { metrics.get(0).name,
--
Gitblit v1.9.1