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

src/main/scala/app/PullRequestsController.scala

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

src/main/scala/app/WikiController.scala

@@ -40,7 +40,7 @@ trait WikiControllerBase extends ControllerBase {
 
     getWikiPage(repository.owner, repository.name, pageName).map { page =>
       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 =>

src/main/scala/util/FileUtil.scala

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

src/main/twirl/wiki/tab.scala.html

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