From 0fe9792a9f194e68288c377810c33973d117923f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 13 Dec 2013 08:12:47 -0500 Subject: [PATCH] Use multiple mappings for the git servlet instead of multiple instances --- src/main/java/com/gitblit/wicket/pages/ActivityPage.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java index 5e7332f..070caf3 100644 --- a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java @@ -71,8 +71,13 @@ // determine repositories to view and retrieve the activity List<RepositoryModel> models = getRepositories(params); - List<Activity> recentActivity = ActivityUtils.getRecentActivity(models, - daysBack, objectId, getTimeZone()); + List<Activity> recentActivity = ActivityUtils.getRecentActivity( + app().settings(), + app().repositories(), + models, + daysBack, + objectId, + getTimeZone()); String headerPattern; if (daysBack == 1) { -- Gitblit v1.9.1