From 835f35393e81c67e6707d54f41359084eb118334 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 18 Apr 2017 11:31:03 +0900 Subject: [PATCH 1/7] Don't retrieve unused repository information when withoutPhysicalInfo is true --- .../core/service/RepositoryService.scala | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/scala/gitbucket/core/service/RepositoryService.scala b/src/main/scala/gitbucket/core/service/RepositoryService.scala index 3640f1c68..0cc3a3b7e 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala @@ -300,7 +300,7 @@ trait RepositoryService { self: AccountService => case None => Repositories filter(_.isPrivate === false.bind) }).filter { t => repositoryUserName.map { userName => t.userName === userName.bind } getOrElse LiteralColumn(true) - }.sortBy(_.lastActivityDate desc).list.map{ repository => + }.sortBy(_.lastActivityDate desc).list.map { repository => new RepositoryInfo( if(withoutPhysicalInfo){ new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName) @@ -308,11 +308,19 @@ trait RepositoryService { self: AccountService => JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName) }, repository, - getForkedCount( - repository.originUserName.getOrElse(repository.userName), - repository.originRepositoryName.getOrElse(repository.repositoryName) - ), - getRepositoryManagers(repository.userName)) + if(withoutPhysicalInfo){ + -1 + } else { + getForkedCount( + repository.originUserName.getOrElse(repository.userName), + repository.originRepositoryName.getOrElse(repository.repositoryName) + ) + }, + if(withoutPhysicalInfo) { + Nil + } else { + getRepositoryManagers(repository.userName) + }) } } From 0f0c3c1b1daf904aa988520fe44e7c6c882bb9ea Mon Sep 17 00:00:00 2001 From: motohacy Date: Tue, 18 Apr 2017 17:24:07 +0900 Subject: [PATCH 2/7] dropdown-menu become scrollable dropdown-menu become scrollable. --- src/main/webapp/assets/common/css/gitbucket.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 45e4f1013..337b989ad 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -342,6 +342,8 @@ div.account-image { ul.dropdown-menu { padding: 2px 0; + overflow: auto; + max-height: 100vh; } ul.dropdown-menu li { From 9c078971abc9212c279df70c77db2a736d9b21a2 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 18 Apr 2017 18:42:56 +0900 Subject: [PATCH 3/7] Don't retrieve unused repository information when withoutPhysicalInfo is true --- .../core/controller/IndexController.scala | 16 ++++++++-------- .../core/service/RepositoryService.scala | 18 +++++++++++++----- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/IndexController.scala b/src/main/scala/gitbucket/core/controller/IndexController.scala index 9d0316fa5..524f26fad 100644 --- a/src/main/scala/gitbucket/core/controller/IndexController.scala +++ b/src/main/scala/gitbucket/core/controller/IndexController.scala @@ -26,13 +26,13 @@ trait IndexControllerBase extends ControllerBase { "password" -> trim(label("Password", text(required))) )(SignInForm.apply) - val searchForm = mapping( - "query" -> trim(text(required)), - "owner" -> trim(text(required)), - "repository" -> trim(text(required)) - )(SearchForm.apply) - - case class SearchForm(query: String, owner: String, repository: String) +// val searchForm = mapping( +// "query" -> trim(text(required)), +// "owner" -> trim(text(required)), +// "repository" -> trim(text(required)) +// )(SearchForm.apply) +// +// case class SearchForm(query: String, owner: String, repository: String) get("/"){ @@ -163,7 +163,7 @@ trait IndexControllerBase extends ControllerBase { get("/search"){ val query = params.getOrElse("query", "").trim.toLowerCase - val visibleRepositories = getVisibleRepositories(context.loginAccount, None) + val visibleRepositories = getVisibleRepositories(context.loginAccount, repositoryUserName = None, withoutPhysicalInfo = true) val repositories = visibleRepositories.filter { repository => repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0 } diff --git a/src/main/scala/gitbucket/core/service/RepositoryService.scala b/src/main/scala/gitbucket/core/service/RepositoryService.scala index 0cc3a3b7e..358083385 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala @@ -262,11 +262,19 @@ trait RepositoryService { self: AccountService => JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName) }, repository, - getForkedCount( - repository.originUserName.getOrElse(repository.userName), - repository.originRepositoryName.getOrElse(repository.repositoryName) - ), - getRepositoryManagers(repository.userName)) + if(withoutPhysicalInfo){ + -1 + } else { + getForkedCount( + repository.originUserName.getOrElse(repository.userName), + repository.originRepositoryName.getOrElse(repository.repositoryName) + ) + }, + if(withoutPhysicalInfo){ + Nil + } else { + getRepositoryManagers(repository.userName) + }) } } From c6449d4c101ef06685b56326182f4aa891ad4623 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Wed, 19 Apr 2017 10:30:11 +0200 Subject: [PATCH 4/7] Scala 2.12.2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b7c12bce3..e1faf5dad 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ sourcesInBase := false organization := Organization name := Name version := GitBucketVersion -scalaVersion := "2.12.1" +scalaVersion := "2.12.2" // dependency settings resolvers ++= Seq( From 37303a8c5a54939d1c1d46722c07b401e8d0c83d Mon Sep 17 00:00:00 2001 From: YT Date: Wed, 19 Apr 2017 20:19:03 +0900 Subject: [PATCH 5/7] make dir in archive --- .../core/controller/RepositoryViewerController.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index 81579f559..6fc90d7e9 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -675,8 +675,8 @@ trait RepositoryViewerControllerBase extends ControllerBase { val oid = git.getRepository.resolve(revision) val revCommit = JGitUtil.getRevCommitFromId(git, oid) val sha1 = oid.getName() - val filename = repository.name + "-" + - (if(sha1.startsWith(revision)) sha1 else revision).replace('/','-') + suffix + val repositorySuffix = (if(sha1.startsWith(revision)) sha1 else revision).replace('/','-') + val filename = repository.name + "-" + repositorySuffix + suffix contentType = "application/octet-stream" response.setHeader("Content-Disposition", s"attachment; filename=${filename}") @@ -684,6 +684,7 @@ trait RepositoryViewerControllerBase extends ControllerBase { git.archive .setFormat(suffix.tail) + .setPrefix(repository.name + "-" + repositorySuffix + "/") .setTree(revCommit) .setOutputStream(response.getOutputStream) .call() From 788e56d9260800d49ab471fe110e99d5a4365bb9 Mon Sep 17 00:00:00 2001 From: KOUNOIKE Yuusuke Date: Wed, 19 Apr 2017 20:46:52 +0900 Subject: [PATCH 6/7] Fix #1525 move attached directory when rename/transfer repo. --- .../controller/RepositorySettingsController.scala | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala index c6f580f9e..dc40df692 100644 --- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala @@ -139,6 +139,12 @@ trait RepositorySettingsControllerBase extends ControllerBase { FileUtils.moveDirectory(dir, getLfsDir(repository.owner, form.repositoryName)) } } + // Move attached directory + defining(getAttachedDir(repository.owner, repository.name)){ dir => + if(dir.isDirectory) { + FileUtils.moveDirectory(dir, getAttachedDir(repository.owner, form.repositoryName)) + } + } // Delete parent directory FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name)) @@ -352,6 +358,12 @@ trait RepositorySettingsControllerBase extends ControllerBase { FileUtils.moveDirectory(dir, getLfsDir(form.newOwner, repository.name)) } } + // Move attached directory + defining(getAttachedDir(repository.owner, repository.name)){ dir => + if(dir.isDirectory) { + FileUtils.moveDirectory(dir, getAttachedDir(form.newOwner, repository.name)) + } + } // Delere parent directory FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name)) From 3af89a789785a69d340d81b3efc0cbca913bbb72 Mon Sep 17 00:00:00 2001 From: YT Date: Thu, 20 Apr 2017 20:26:45 +0900 Subject: [PATCH 7/7] modify branch filter method --- src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html b/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html index 09e3febf1..4d3c673b1 100644 --- a/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html +++ b/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html @@ -31,7 +31,7 @@ $('#branch-control-input').keyup(function() { var inputVal = $('#branch-control-input').val(); $.each($('#branch-control-input').parent().parent().find('a'), function(index, elem) { - if (!inputVal || !elem.text.trim() || elem.text.trim().lastIndexOf(inputVal, 0) >= 0) { + if (!inputVal || !elem.text.trim() || elem.text.trim().match(new RegExp(inputVal,'i'))) { $(elem).parent().show(); } else { $(elem).parent().hide();