Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 14:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into webhook

Browse Source
This commit is contained in:
takezoe
2013-09-12 01:34:31 +09:00
parent 4d1605ded2 e6e5cc67d5
commit 90a83c5c64
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/app/SignInController.scala
View File

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

1
src/main/scala/service/RepositoryService.scala
View File

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

2
src/main/twirl/helper/activities.scala.html
View File

@@ -24,11 +24,13 @@
if(i == 3){ if(i == 3){
<div>...</div> <div>...</div>
} else { } else {
if(commit.nonEmpty){
<div> <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> <span>{commit.substring(41)}</span>
</div> </div>
} }
}
}} }}
</div> </div>
} }