Merge branch 'master' into webhook

src/main/scala/app/SignInController.scala

@@ -42,9 +42,13 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
     session.setAttribute("LOGIN_ACCOUNT", account)
     updateLastLoginDate(account.userName)
 
-    session.get("REDIRECT").map { redirectUrl =>
+    session.get("REDIRECT").map { case redirectUrl: String =>
       session.removeAttribute("REDIRECT")
-      redirect(redirectUrl.asInstanceOf[String])
+      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
+        redirect("/")
+      } else {
+        redirect(redirectUrl)
+      }
     }.getOrElse {
       redirect("/")
     }

src/main/scala/service/RepositoryService.scala

@@ -47,6 +47,7 @@ trait RepositoryService { self: AccountService =>
     Labels        .filter(_.byRepository(userName, repositoryName)).delete
     IssueComments .filter(_.byRepository(userName, repositoryName)).delete
     Issues        .filter(_.byRepository(userName, repositoryName)).delete
+    PullRequests  .filter(_.byRepository(userName, repositoryName)).delete
     IssueId       .filter(_.byRepository(userName, repositoryName)).delete
     Milestones    .filter(_.byRepository(userName, repositoryName)).delete
     Repositories  .filter(_.byRepository(userName, repositoryName)).delete

src/main/twirl/helper/activities.scala.html

@@ -24,11 +24,13 @@
               if(i == 3){
                 <div>...</div>
               } else {
+                if(commit.nonEmpty){
                   <div>
-                   <a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit.substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a>
+                     <a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit. substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a>
                      <span>{commit.substring(41)}</span>
                   </div>
                 }
+              }
             }}
           </div>
         }