From 1fddc01f6e4fce25537aec54ea30ad282b1a4616 Mon Sep 17 00:00:00 2001 From: kanmi Date: Wed, 16 Sep 2015 01:28:31 +0900 Subject: [PATCH 1/6] Specify option to generate an RSA key --- src/main/scala/gitbucket/core/ssh/SshServerListener.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala index 1288eb106..27f46ac60 100644 --- a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala +++ b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala @@ -14,7 +14,7 @@ object SshServer { private def configure(port: Int, baseUrl: String) = { server.setPort(port) - server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(s"${Directory.GitBucketHome}/gitbucket.ser")) + server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(s"${Directory.GitBucketHome}/gitbucket.ser", "RSA")) server.setPublickeyAuthenticator(new PublicKeyAuthenticator) server.setCommandFactory(new GitCommandFactory(baseUrl)) server.setShellFactory(new NoShell) From 5d526f243e3245ba4dd638a7ae152bf35a73c23b Mon Sep 17 00:00:00 2001 From: Yota Ichino Date: Mon, 12 Oct 2015 15:50:26 +0900 Subject: [PATCH 2/6] Change place of Comment button and Close button. --- src/main/twirl/gitbucket/core/issues/commentform.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/gitbucket/core/issues/commentform.scala.html b/src/main/twirl/gitbucket/core/issues/commentform.scala.html index 511fe47bb..aaf40fa1b 100644 --- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html +++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html @@ -22,10 +22,10 @@ )
- @if((reopenable || !issue.closed) && (hasWritePermission || issue.openedUserName == loginAccount.get.userName)){ } +
From 5a1ab8d4850a4d0c971ca33d353f8b5ef2a4b388 Mon Sep 17 00:00:00 2001 From: Yota Ichino Date: Mon, 12 Oct 2015 16:41:15 +0900 Subject: [PATCH 3/6] Set tabindex for the comment form. --- src/main/twirl/gitbucket/core/helper/preview.scala.html | 2 ++ .../twirl/gitbucket/core/issues/commentform.scala.html | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/twirl/gitbucket/core/helper/preview.scala.html b/src/main/twirl/gitbucket/core/helper/preview.scala.html index 7f8e5c42c..7402c85df 100644 --- a/src/main/twirl/gitbucket/core/helper/preview.scala.html +++ b/src/main/twirl/gitbucket/core/helper/preview.scala.html @@ -8,6 +8,7 @@ styleClass: String = "", placeholder: String = "Leave a comment", elastic: Boolean = false, + tabIndex: Int = -2, uid: Long = new java.util.Date().getTime())(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core._ @@ -22,6 +23,7 @@ @textarea = { } diff --git a/src/main/twirl/gitbucket/core/issues/commentform.scala.html b/src/main/twirl/gitbucket/core/issues/commentform.scala.html index aaf40fa1b..040b9e097 100644 --- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html +++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html @@ -18,14 +18,15 @@ enableTaskList = true, hasWritePermission = hasWritePermission, style = "", - elastic = true + elastic = true, + tabIndex = 1 )
@if((reopenable || !issue.closed) && (hasWritePermission || issue.openedUserName == loginAccount.get.userName)){ - + } - +
From 1a97beb8cfcbc07eff7f4712049810d86e0d5d85 Mon Sep 17 00:00:00 2001 From: nazoking Date: Mon, 12 Oct 2015 21:45:36 +0900 Subject: [PATCH 4/6] (ref #933) fix/Unable to download large file --- .../RepositoryViewerController.scala | 8 ++++++-- .../scala/gitbucket/core/util/JGitUtil.scala | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index 680486ff4..ab431cd14 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -293,8 +293,12 @@ trait RepositoryViewerControllerBase extends ControllerBase { getPathObjectId(git, path, revCommit).map { objectId => if(raw){ // Download - JGitUtil.getContentFromId(git, objectId, true).map { bytes => - RawData("application/octet-stream", bytes) + JGitUtil.getObjectLoaderFromId(git, objectId){ loader => + //RawData("application/octet-stream", bytes) + contentType = "application/octet-stream" + response.setContentLength(loader.getSize.toInt) + loader.copyTo(response.getOutputStream) + Unit } getOrElse NotFound } else { html.blob(id, repository, path.split("/").toList, diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index 3eef33d19..4d48c763f 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -713,7 +713,7 @@ object JGitUtil { def getContentFromId(git: Git, id: ObjectId, fetchLargeFile: Boolean): Option[Array[Byte]] = try { using(git.getRepository.getObjectDatabase){ db => val loader = db.open(id) - if(fetchLargeFile == false && FileUtil.isLarge(loader.getSize)){ + if(loader.isLarge || (fetchLargeFile == false && FileUtil.isLarge(loader.getSize))){ None } else { Some(loader.getBytes) @@ -723,6 +723,22 @@ object JGitUtil { case e: MissingObjectException => None } + /** + * Get objectLoader of the given object id from the Git repository. + * + * @param git the Git object + * @param id the object id + * @param f the function process ObjectLoader + * @return None if object does not exist + */ + def loaderFromId[A](git: Git, id: ObjectId)(f: ObjectLoader => A):Option[A] = try { + using(git.getRepository.getObjectDatabase){ db => + Some(f(db.open(id))) + } + } catch { + case e: MissingObjectException => None + } + /** * Returns all commit id in the specified repository. */ From 5194fc5f15eacd9fbef54a88ad223673c2b217de Mon Sep 17 00:00:00 2001 From: nazoking Date: Mon, 12 Oct 2015 23:24:36 +0900 Subject: [PATCH 5/6] (ref #933) fix/Unable to download large file (fix method name) --- src/main/scala/gitbucket/core/util/JGitUtil.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index 4d48c763f..43c25212d 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -731,7 +731,7 @@ object JGitUtil { * @param f the function process ObjectLoader * @return None if object does not exist */ - def loaderFromId[A](git: Git, id: ObjectId)(f: ObjectLoader => A):Option[A] = try { + def getObjectLoaderFromId[A](git: Git, id: ObjectId)(f: ObjectLoader => A):Option[A] = try { using(git.getRepository.getObjectDatabase){ db => Some(f(db.open(id))) } From a1efa607418f824755cb030db13f170a8cada76c Mon Sep 17 00:00:00 2001 From: nazoking Date: Tue, 13 Oct 2015 18:57:20 +0900 Subject: [PATCH 6/6] fix return value --- .../gitbucket/core/controller/RepositoryViewerController.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index ab431cd14..27afd4787 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -298,7 +298,7 @@ trait RepositoryViewerControllerBase extends ControllerBase { contentType = "application/octet-stream" response.setContentLength(loader.getSize.toInt) loader.copyTo(response.getOutputStream) - Unit + () } getOrElse NotFound } else { html.blob(id, repository, path.split("/").toList,