Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 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) {