Merge branch '401-news-feed-of-private-repo' of https://github.com/utensil/gitbucket into utensil-401-news-feed-of-private-repo

Conflicts:
	src/main/scala/app/IndexController.scala
	src/main/scala/service/ActivityService.scala

src/main/scala/app/IndexController.scala

@@ -20,11 +20,23 @@ trait IndexControllerBase extends ControllerBase {
 
   get("/"){
     val loginAccount = context.loginAccount
-
+    if(loginAccount.isEmpty) {
         html.index(getRecentActivities(),
             getVisibleRepositories(loginAccount, context.baseUrl, withoutPhysicalInfo = true),
             loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl, withoutPhysicalInfo = true) }.getOrElse(Nil)
         )
+    } else {
+        val loginUserName = loginAccount.get.userName
+        val loginUserGroups = getGroupsByUserName(loginUserName)
+        var visibleOwnerSet : Set[String] = Set(loginUserName)
+        
+        visibleOwnerSet ++= loginUserGroups
+
+        html.index(getRecentActivitiesByOwners(visibleOwnerSet),
+            getVisibleRepositories(loginAccount, context.baseUrl, withoutPhysicalInfo = true),
+            loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl, withoutPhysicalInfo = true) }.getOrElse(Nil) 
+        )
+    }
   }
 
   get("/signin"){

src/main/scala/service/ActivityService.scala

@@ -29,6 +29,15 @@ trait ActivityService {
       .take(30)
       .list
 
+  def getRecentActivitiesByOwners(owners : Set[String])(implicit s: Session): List[Activity] =
+    Activities
+      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .filter { case (t1, t2) => (t2.isPrivate is false.bind) || (t2.userName inSetBind owners) }
+      .sortBy { case (t1, t2) => t1.activityId desc }
+      .map    { case (t1, t2) => t1 }
+      .take(30)
+      .list
+
   def recordCreateRepositoryActivity(userName: String, repositoryName: String, activityUserName: String)
                                     (implicit s: Session): Unit =
     Activities insert Activity(userName, repositoryName, activityUserName,