From 37d5b7cda27ae7da5690f0b0ce0dee4421624810 Mon Sep 17 00:00:00 2001 From: Alfred Schmid <A.Schmid@ff-muenchen.de> Date: Wed, 19 Feb 2014 09:01:34 -0500 Subject: [PATCH] Show "Displayname (username)" in palettes for edit team and repository pages --- src/main/java/com/gitblit/wicket/panels/ActivityPanel.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java b/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java index e5c8e46..bbb7608 100644 --- a/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java @@ -25,7 +25,6 @@ import org.eclipse.jgit.lib.Repository; import com.gitblit.Constants; -import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.Activity; import com.gitblit.models.RepositoryCommit; @@ -53,7 +52,7 @@ Collections.sort(recentActivity); - final int shortHashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6); + final int shortHashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6); DataView<Activity> activityView = new DataView<Activity>("activity", new ListDataProvider<Activity>(recentActivity)) { private static final long serialVersionUID = 1L; -- Gitblit v1.9.1