Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 22:15:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/takezoe/gitbucket.git

Browse Source
This commit is contained in:
shimamoto
2013-09-18 19:22:25 +09:00
parent accb1cf2ab aa8da1b046
commit d5b47e5adb
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/app/PullRequestsController.scala
View File

@@ -112,8 +112,6 @@ trait PullRequestsControllerBase extends ControllerBase {
// record activity // record activity
recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message) recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message)
// TODO apply ref comment
// fetch pull request to temporary working repository // fetch pull request to temporary working repository
val pullRequestBranchName = s"gitbucket-pullrequest-${issueId}" val pullRequestBranchName = s"gitbucket-pullrequest-${issueId}"

2
src/main/scala/app/WikiController.scala
View File

@@ -40,7 +40,7 @@ trait WikiControllerBase extends ControllerBase {
getWikiPage(repository.owner, repository.name, pageName).map { page => getWikiPage(repository.owner, repository.name, pageName).map { page =>
wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount)) wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
} getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${pageName}/_edit") // TODO URLEncode } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
}) })
get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository => get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository =>

2
src/main/scala/util/FileUtil.scala
View File

@@ -11,7 +11,7 @@ object FileUtil {
val fileNameMap = URLConnection.getFileNameMap() val fileNameMap = URLConnection.getFileNameMap()
val mimeType = fileNameMap.getContentTypeFor(name) val mimeType = fileNameMap.getContentTypeFor(name)
if(mimeType == null){ if(mimeType == null){
"application/octeat-stream" "application/octet-stream"
} else { } else {
mimeType mimeType
} }

4
src/main/twirl/wiki/tab.scala.html
View File

@@ -2,8 +2,8 @@
@import context._ @import context._
@import view.helpers._ @import view.helpers._
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li@if(active == "home"){ class="active"}><a href="@url(repository)/wiki">Home</a></li> <li@if(active == "home" ){ class="active"}><a href="@url(repository)/wiki">Home</a></li>
<li@if(active == "pages"){ class="active"}><a href="@url(repository)/wiki/_pages">Pages</a></li> <li@if(active == "pages" ){ class="active"}><a href="@url(repository)/wiki/_pages">Pages</a></li>
<li@if(active == "history"){ class="active"}><a href="@url(repository)/wiki/_history">Wiki History</a></li> <li@if(active == "history"){ class="active"}><a href="@url(repository)/wiki/_history">Wiki History</a></li>
<li class="pull-right"> <li class="pull-right">
@defining(repository.url.replaceFirst("\\.git$", ".wiki.git")){ repositoryUrl => @defining(repository.url.replaceFirst("\\.git$", ".wiki.git")){ repositoryUrl =>