From 4ff1429245b3748372643251a92d71821f257ccf Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 17 Mar 2014 09:36:09 -0400 Subject: [PATCH] Merged #33 "Merge overrides in addition to merging the normal settings" --- src/main/java/com/gitblit/wicket/panels/BranchesPanel.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java index 28751fa..6a7873e 100644 --- a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java @@ -133,7 +133,7 @@ CommitPage.class, WicketUtils.newObjectParameter(model.name, entry.getName())); if (!shortMessage.equals(trimmedMessage)) { - WicketUtils.setHtmlTooltip(shortlog, shortMessage); + shortlog.setTooltip(shortMessage); } item.add(shortlog); -- Gitblit v1.9.1