From dc78dc9b0dbc27418c42d2347681c22430c3ebfe Mon Sep 17 00:00:00 2001 From: odz Date: Sat, 30 Nov 2013 18:57:19 +0900 Subject: [PATCH 01/30] Close issues via commit messages --- src/main/scala/app/PullRequestsController.scala | 13 +++++++++++++ src/main/scala/service/IssuesService.scala | 12 ++++++++++++ src/main/scala/servlet/GitRepositoryServlet.scala | 8 ++++++++ 3 files changed, 33 insertions(+) diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 365fb9270..e91ff786e 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -163,6 +163,19 @@ trait PullRequestsControllerBase extends ControllerBase { } } + // close issue by content of pull request + val defaultBranch = getRepository(owner, name, baseUrl).get.repository.defaultBranch + if(pullreq.branch == defaultBranch){ + commits.flatten.foreach { commit => + closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name) + } + issue.content match { + case Some(content) => closeIssuesFromMessage(content, loginAccount.userName, owner, name) + case _ => + } + closeIssuesFromMessage(form.message, loginAccount.userName, owner, name) + } + // notifications Notifier().toNotify(repository, issueId, "merge"){ Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/pull/${issueId}") diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index 493692e4d..ec6f93619 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -314,6 +314,18 @@ trait IssuesService { }.toList } + def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = { + val regex = "(?i)(? + getIssue(owner, repository, issueId) match { + case Some(issue) if !issue.closed => { + createComment(owner, repository, userName, issue.issueId, "Close", "close") + updateClosed(owner, repository, issue.issueId, true) + } + case _ => + } + } + } } object IssuesService { diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index a00a92811..4c02070de 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -140,6 +140,14 @@ class CommitLogHook(owner: String, repository: String, userName: String, baseURL } } + // close issues + val defaultBranch = getRepository(owner, repository, baseURL).get.repository.defaultBranch + if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){ + git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach { commit => + closeIssuesFromMessage(commit.getFullMessage, userName, owner, repository) + } + } + // call web hook val webHookURLs = getWebHookURLs(owner, repository) if(webHookURLs.nonEmpty){ From 78073babe496a2232932c614b635c9305d9d1285 Mon Sep 17 00:00:00 2001 From: takezoe Date: Wed, 19 Feb 2014 03:19:34 +0900 Subject: [PATCH 02/30] (refs #231)Add anchor icon for headlines in Markdown. --- src/main/scala/view/Markdown.scala | 5 +++-- .../webapp/assets/common/css/gitbucket.css | 15 +++++++++++++ src/main/webapp/assets/common/images/link.png | Bin 0 -> 343 bytes src/main/webapp/assets/common/js/gitbucket.js | 20 ++++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/assets/common/images/link.png diff --git a/src/main/scala/view/Markdown.scala b/src/main/scala/view/Markdown.scala index dba96703e..483f3ea5d 100644 --- a/src/main/scala/view/Markdown.scala +++ b/src/main/scala/view/Markdown.scala @@ -116,8 +116,9 @@ class GitBucketHtmlSerializer( val tag = s"h${node.getLevel}" val headerTextString = printChildrenToString(node) val anchorName = GitBucketHtmlSerializer.generateAnchorName(headerTextString) - printer.print(s"<$tag>") - printer.print(s"""""") + printer.print(s"""<$tag class="markdown-head">""") + printer.print(s"""""") + printer.print(s"""""") visitChildren(node) printer.print(s"") } diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 4c69e737f..8df22fc6b 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -850,3 +850,18 @@ div.markdown-body table colgroup + tbody tr:first-child td:last-child { border-top-right-radius: 4px; -moz-border-radius-topright: 4px; } + +.markdown-head { + position: relative; +} + +a.markdown-anchor-link { + position: absolute; + top: 16px; + left: -20px; + width: 32px; + height: 16px; + background-image: url(../images/link.png); + background-repeat: no-repeat; + display: none; +} diff --git a/src/main/webapp/assets/common/images/link.png b/src/main/webapp/assets/common/images/link.png new file mode 100644 index 0000000000000000000000000000000000000000..25eacb7c2524142262d68bf729c5e2b61adfd6d4 GIT binary patch literal 343 zcmV-d0jU0oP)$`dXYaZs9=SbAto%g@>T~?_bH&lTUn@`uo|1bXE{eSR(AO)ESb=V4`uk}mK|39Px&03WLbv~pzk+s7D@lK^ zn+aB+sp)&Y_x-B3>;6ywU--WQNUr<8>TU0P-|L#1U&;A)67w(+> pDf@fM7q9#F25QXo3rUI;002ro52U44e~JJA002ovPDHLkV1l;_q@Mr) literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/common/js/gitbucket.js b/src/main/webapp/assets/common/js/gitbucket.js index 5c6233d0b..12e86fa2a 100644 --- a/src/main/webapp/assets/common/js/gitbucket.js +++ b/src/main/webapp/assets/common/js/gitbucket.js @@ -11,6 +11,26 @@ $(function(){ $('img[data-toggle=tooltip]').tooltip(); $('a[data-toggle=tooltip]').tooltip(); + // anchor icon for markdown + $('.markdown-head').mouseenter(function(e){ + $(e.target).children('a.markdown-anchor-link').show(); + }); + $('.markdown-head').mouseleave(function(e){ + var anchorLink = $(e.target).children('a.markdown-anchor-link'); + if(anchorLink.data('active') != true){ + anchorLink.hide(); + } + }); + + $('a.markdown-anchor-link').mouseenter(function(e){ + $(e.target).data('active', true); + }); + + $('a.markdown-anchor-link').mouseleave(function(e){ + $(e.target).data('active', false); + $(e.target).hide(); + }); + // syntax highlighting by google-code-prettify prettyPrint(); }); From 8536824d7e231bc8a66126c088cedfb0f84d2d9f Mon Sep 17 00:00:00 2001 From: takezoe Date: Wed, 19 Feb 2014 03:40:39 +0900 Subject: [PATCH 03/30] (refs #231)Fix anchor icon style and apply URL encoding to non-ascii chars in anchor name. --- src/main/scala/view/Markdown.scala | 4 +--- src/main/webapp/assets/common/css/gitbucket.css | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/scala/view/Markdown.scala b/src/main/scala/view/Markdown.scala index 483f3ea5d..6b7ab2dc7 100644 --- a/src/main/scala/view/Markdown.scala +++ b/src/main/scala/view/Markdown.scala @@ -143,12 +143,10 @@ object GitBucketHtmlSerializer { private val Whitespace = "[\\s]".r - private val SpecialChars = "[^\\w-]".r - def generateAnchorName(text: String): String = { val noWhitespace = Whitespace.replaceAllIn(text, "-") val normalized = Normalizer.normalize(noWhitespace, Normalizer.Form.NFD) - val noSpecialChars = SpecialChars.replaceAllIn(normalized, "") + val noSpecialChars = StringUtil.urlEncode(normalized) noSpecialChars.toLowerCase(Locale.ENGLISH) } } diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 8df22fc6b..01c96b414 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -857,7 +857,6 @@ div.markdown-body table colgroup + tbody tr:first-child td:last-child { a.markdown-anchor-link { position: absolute; - top: 16px; left: -20px; width: 32px; height: 16px; @@ -865,3 +864,7 @@ a.markdown-anchor-link { background-repeat: no-repeat; display: none; } + +h1 a.markdown-anchor-link, h2 a.markdown-anchor-link, h3 a.markdown-anchor-link { + top: 10px; +} From bb9a23fe0f9596c2f93703ca906d1ca638e70aa8 Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 20 Feb 2014 03:40:06 +0900 Subject: [PATCH 04/30] Fix TestCase. --- src/test/scala/view/GitBucketHtmlSerializerSpec.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/scala/view/GitBucketHtmlSerializerSpec.scala b/src/test/scala/view/GitBucketHtmlSerializerSpec.scala index d82630d3b..946b62629 100644 --- a/src/test/scala/view/GitBucketHtmlSerializerSpec.scala +++ b/src/test/scala/view/GitBucketHtmlSerializerSpec.scala @@ -16,13 +16,13 @@ class GitBucketHtmlSerializerSpec extends Specification { "normalize characters with diacritics" in { val before = "Dónde estará mi vida" val after = generateAnchorName(before) - after mustEqual "donde-estara-mi-vida" + after mustEqual "do%cc%81nde-estara%cc%81-mi-vida" } "omit special characters" in { val before = "foo!bar@baz>9000" val after = generateAnchorName(before) - after mustEqual "foobarbaz9000" + after mustEqual "foo%21bar%40baz%3e9000" } } } From 7ba1f85d484bbccd0c09e33682048fbdd01586e4 Mon Sep 17 00:00:00 2001 From: takezoe Date: Fri, 21 Feb 2014 11:39:02 +0900 Subject: [PATCH 05/30] (refs #187)Repository icons are updated. --- etc/icons.svg | 242 +++++++++++++++++- src/main/twirl/header.scala.html | 11 +- src/main/twirl/index.scala.html | 22 +- src/main/twirl/newrepo.scala.html | 4 +- .../webapp/assets/common/images/repo_fork.png | Bin 0 -> 285 bytes .../assets/common/images/repo_private.png | Bin 0 -> 280 bytes .../assets/common/images/repo_public.png | Bin 0 -> 247 bytes 7 files changed, 260 insertions(+), 19 deletions(-) create mode 100644 src/main/webapp/assets/common/images/repo_fork.png create mode 100644 src/main/webapp/assets/common/images/repo_private.png create mode 100644 src/main/webapp/assets/common/images/repo_public.png diff --git a/etc/icons.svg b/etc/icons.svg index 6943304f2..c2efe0e4d 100644 --- a/etc/icons.svg +++ b/etc/icons.svg @@ -25,17 +25,17 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" - inkscape:cx="629.30023" - inkscape:cy="281.44758" + inkscape:cx="450.21999" + inkscape:cy="97.51519" inkscape:document-units="px" inkscape:current-layer="layer1-9" showgrid="false" inkscape:window-width="1366" - inkscape:window-height="705" - inkscape:window-x="-8" + inkscape:window-height="706" + inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:snap-global="true" + inkscape:snap-global="false" inkscape:snap-grids="false" inkscape:snap-page="false" inkscape:snap-bbox="true" @@ -746,6 +746,238 @@ d="m 937.41093,1044.4944 0,30.6797 -28.50183,0 0,41.2377 28.50183,0 0,27.1288 41.19033,0 0,-27.1288 29.35404,0 0,-41.2377 -29.35404,0 0,-30.6797 -41.19033,0 z" id="rect2995-0-2-7-7" inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html index b132711f3..5ab75e0e6 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/header.scala.html @@ -12,10 +12,13 @@ }
@if(repository.repository.isPrivate){ - - } - @if(!repository.repository.isPrivate){ - + + } else { + @if(repository.repository.originUserName.isDefined){ + + } else { + + } } @repository.owner / @repository.name diff --git a/src/main/twirl/index.scala.html b/src/main/twirl/index.scala.html index ef8bd670d..c6e3de6a9 100644 --- a/src/main/twirl/index.scala.html +++ b/src/main/twirl/index.scala.html @@ -32,10 +32,13 @@ @if(repository.repository.isPrivate){ - - } - @if(!repository.repository.isPrivate){ - + + } else { + @if(repository.repository.originUserName.isDefined){ + + } else { + + } } @if(repository.owner == loginAccount.get.userName){ @repository.name @@ -64,10 +67,13 @@ @if(repository.repository.isPrivate){ - - } - @if(!repository.repository.isPrivate){ - + + } else { + @if(repository.repository.originUserName.isDefined){ + + } else { + + } } @repository.owner/@repository.name diff --git a/src/main/twirl/newrepo.scala.html b/src/main/twirl/newrepo.scala.html index 6d24a9c7a..05fefbc4d 100644 --- a/src/main/twirl/newrepo.scala.html +++ b/src/main/twirl/newrepo.scala.html @@ -30,7 +30,7 @@
@@ -76,6 +76,7 @@ $('#search').submit(function(){ return $.trim($(this).find('input[name=query]').val()) != ''; }); + $('#signin').attr('href', '@path/signin?redirect=' + encodeURIComponent(location.pathname + location.search + location.hash)); }); From b5d7c96bbad12d3d73f2454a4d7943e854aaa443 Mon Sep 17 00:00:00 2001 From: Ali Ayas Date: Sun, 23 Feb 2014 13:11:10 +0200 Subject: [PATCH 10/30] Apply GitHub diff colors However, jsdifflib is still not a good approach. It requires dumping all the two text to the browser and do the work there. Instead, maybe the diff should be taken from the git itself and highlighting should be applied on that. OTOH, word level diff would be good when applicable (like GitHub does). --- src/main/webapp/assets/jsdifflib/diffview.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/assets/jsdifflib/diffview.css b/src/main/webapp/assets/jsdifflib/diffview.css index 811a593b7..4c4a7c7f2 100644 --- a/src/main/webapp/assets/jsdifflib/diffview.css +++ b/src/main/webapp/assets/jsdifflib/diffview.css @@ -66,7 +66,7 @@ table.diff .replace { background-color:#FD8 } table.diff .delete { - background-color:#E99; + background-color:#FFDDDD; } table.diff .skip { background-color:#EFEFEF; @@ -74,10 +74,10 @@ table.diff .skip { border-right:1px solid #BBC; } table.diff .insert { - background-color:#9E9 + background-color:#DDFFDD } table.diff th.author { text-align:right; border-top:1px solid #BBC; background:#EFEFEF -} \ No newline at end of file +} From 0dd37c2481fb07275878385618b41ae1973cc61f Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 24 Feb 2014 02:14:10 +0900 Subject: [PATCH 11/30] (refs #279)Fix redirect URL generation in authentication. --- src/main/scala/app/ControllerBase.scala | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index f80d15a5b..bdea0421e 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -59,11 +59,6 @@ abstract class ControllerBase extends ScalatraFilter */ implicit def context: Context = Context(servletContext.getContextPath, LoginAccount, request) - // TODO This method should be remvoved. - private def currentURL: String = defining(request.getQueryString){ queryString => - request.getRequestURI + (if(queryString != null) "?" + queryString else "") - } - private def LoginAccount: Option[Account] = session.getAs[Account](Keys.Session.LoginAccount) def ajaxGet(path : String)(action : => Any) : Route = @@ -107,8 +102,11 @@ abstract class ControllerBase extends ScalatraFilter if(request.getMethod.toUpperCase == "POST"){ org.scalatra.Unauthorized(redirect("/signin")) } else { - // TODO This URL may not be same as the front URL... - org.scalatra.Unauthorized(redirect("/signin?redirect=" + StringUtil.urlEncode(currentURL))) + val currentUrl = baseUrl + defining(request.getQueryString){ queryString => + request.getRequestURI.substring(request.getContextPath.length) + (if(queryString != null) "?" + queryString else "") + } + session.setAttribute(Keys.Session.Redirect, currentUrl) + org.scalatra.Unauthorized(redirect("/signin")) } } } @@ -117,7 +115,7 @@ abstract class ControllerBase extends ScalatraFilter defining(request.getRequestURL.toString){ url => url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length)) } - } + }.replaceFirst("/$", "") } From c114a8b507b7aa5a3ca8ae47d79b284901f9ea86 Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 24 Feb 2014 02:16:18 +0900 Subject: [PATCH 12/30] (refs #279)Fix TestCase. --- src/test/scala/view/AvatarImageProviderSpec.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/scala/view/AvatarImageProviderSpec.scala b/src/test/scala/view/AvatarImageProviderSpec.scala index d5e577537..f33731649 100644 --- a/src/test/scala/view/AvatarImageProviderSpec.scala +++ b/src/test/scala/view/AvatarImageProviderSpec.scala @@ -10,7 +10,7 @@ import twirl.api.Html class AvatarImageProviderSpec extends Specification { - implicit val context = app.Context("", None, "", null) + implicit val context = app.Context("", None, null) "getAvatarImageHtml" should { "show Gravatar image for no image account if gravatar integration is enabled" in { @@ -80,6 +80,7 @@ class AvatarImageProviderSpec extends Specification { private def createSystemSettings(useGravatar: Boolean) = SystemSettings( + baseUrl = None, allowAccountRegistration = false, gravatar = useGravatar, notification = false, From 99d15899f6b9c53ea491f1df9945de00f15204b5 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 24 Feb 2014 02:32:19 +0900 Subject: [PATCH 13/30] Update README.md --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ef29df76..8c7eca645 100644 --- a/README.md +++ b/README.md @@ -59,12 +59,23 @@ Run the following commands in `Terminal` to Release Notes -------- +### 1.11 - End of Mar 2014 +- Base URL for redirect, notification and repository URL box is configurable +- Headline anchor is available for Markdown contents such as Wiki page +- Improve H2 connectivity +- Label is available for pull requests not only issues +- Delete branch button is added +- Repository icons are updated +- Select lines of source code by URL hash like `#L10` or `#L10-L15` in repository viewer +- Display reference to issue from others in comment list +- Fix some bugs + ### 1.10 - 01 Feb 2014 - Rename repository - Transfer repository owner - Change default data directory to `HOME/.gitbucket` from `HOME/gitbucket` to avoid problem like #243, but if data directory already exist at HOME/gitbucket, it continues being used. - Add LDAP display name attribute -- Response improvement +- Response performance improvement - Fix some bugs ### 1.9 - 28 Dec 2013 From 5b34b9c7952cd7feb7547ea19683f2ec5cb65987 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 24 Feb 2014 02:34:13 +0900 Subject: [PATCH 14/30] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c7eca645..fa6718dc6 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ Run the following commands in `Terminal` to Release Notes -------- -### 1.11 - End of Mar 2014 +### 1.11 - End of Feb 2014 - Base URL for redirect, notification and repository URL box is configurable - Headline anchor is available for Markdown contents such as Wiki page - Improve H2 connectivity From 2c14dfb781dae1e3fd8610aad047a4b9fdf14495 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Wed, 26 Feb 2014 12:09:14 +0100 Subject: [PATCH 15/30] Show the correct name of the readme file (instead of showing always README.md). --- src/main/scala/app/RepositoryViewerController.scala | 2 +- src/main/twirl/repo/files.scala.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index 272613682..fcc81dfe6 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -276,7 +276,7 @@ trait RepositoryViewerControllerBase extends ControllerBase { val readme = files.find { file => readmeFiles.contains(file.name.toLowerCase) }.map { file => - StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get) + file -> StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get) } repo.html.files(revision, repository, diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 94f6dac3d..823298ec7 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -3,7 +3,7 @@ pathList: List[String], latestCommit: util.JGitUtil.CommitInfo, files: List[util.JGitUtil.FileInfo], - readme: Option[String])(implicit context: app.Context) + readme: Option[(util.JGitUtil.FileInfo, String)])(implicit context: app.Context) @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @@ -77,9 +77,9 @@ - @readme.map { content => + @readme.map { case(file, content) =>
-
README.md
+
@file.name
@markdown(content, repository, false, false)
} From 7a0a62af2d94dde1e2ce548c3ed3d17656b87501 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Fri, 28 Feb 2014 15:25:32 +0100 Subject: [PATCH 16/30] Show repository description below the name on repository page. --- src/main/twirl/header.scala.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html index bb2be97e3..965fa9381 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/header.scala.html @@ -29,7 +29,13 @@ } } + + + @if(repository.repository.description != "") { +

@repository.repository.description

+ } +
From f13d757976b1ba5f79fd8d863cbdb41d5f1d200b Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Fri, 28 Feb 2014 16:28:40 +0100 Subject: [PATCH 17/30] Compare email adresses case-insensitive. --- src/main/scala/service/AccountService.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/service/AccountService.scala b/src/main/scala/service/AccountService.scala index 84e78a1a4..ff1186f65 100644 --- a/src/main/scala/service/AccountService.scala +++ b/src/main/scala/service/AccountService.scala @@ -59,7 +59,7 @@ trait AccountService { Query(Accounts) filter(t => (t.userName is userName.bind) && (t.removed is false.bind, !includeRemoved)) firstOption def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false): Option[Account] = - Query(Accounts) filter(t => (t.mailAddress is mailAddress.bind) && (t.removed is false.bind, !includeRemoved)) firstOption + Query(Accounts) filter(t => (t.mailAddress.toLowerCase is mailAddress.toLowerCase.bind) && (t.removed is false.bind, !includeRemoved)) firstOption def getAllUsers(includeRemoved: Boolean = true): List[Account] = if(includeRemoved){ From 98266fe0e1a7f57af2f1305d32b68cecbb138c31 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 13:05:42 +0900 Subject: [PATCH 18/30] (refs #279)Fix webhook URL to use the configured base URL. --- src/main/scala/app/ControllerBase.scala | 6 ------ src/main/scala/service/SystemSettingsService.scala | 7 +++++++ src/main/scala/servlet/GitRepositoryServlet.scala | 14 ++++++-------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index bdea0421e..0bf4676c4 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -111,12 +111,6 @@ abstract class ControllerBase extends ScalatraFilter } } - protected def baseUrl = loadSystemSettings().baseUrl.getOrElse { - defining(request.getRequestURL.toString){ url => - url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length)) - } - }.replaceFirst("/$", "") - } /** diff --git a/src/main/scala/service/SystemSettingsService.scala b/src/main/scala/service/SystemSettingsService.scala index de7a9662f..f15bd3782 100644 --- a/src/main/scala/service/SystemSettingsService.scala +++ b/src/main/scala/service/SystemSettingsService.scala @@ -3,9 +3,16 @@ package service import util.Directory._ import util.ControlUtil._ import SystemSettingsService._ +import javax.servlet.http.HttpServletRequest trait SystemSettingsService { + def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl.getOrElse { + defining(request.getRequestURL.toString){ url => + url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length)) + } + }.replaceFirst("/$", "") + def saveSystemSettings(settings: SystemSettings): Unit = { defining(new java.util.Properties()){ props => settings.baseUrl.foreach(props.setProperty(BaseURL, _)) diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index 7eedd2137..2c521c804 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -50,10 +50,10 @@ class GitRepositoryServlet extends GitServlet { } -class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] { +class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] with SystemSettingsService { private val logger = LoggerFactory.getLogger(classOf[GitBucketReceivePackFactory]) - + override def create(request: HttpServletRequest, db: Repository): ReceivePack = { val receivePack = new ReceivePack(db) val pusher = request.getAttribute(Keys.Request.UserName).asInstanceOf[String] @@ -64,13 +64,11 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] defining(request.paths){ paths => val owner = paths(1) val repository = paths(2).replaceFirst("\\.git$", "") - val baseURL = request.getRequestURL.toString.replaceFirst("/git/.*", "") logger.debug("repository:" + owner + "/" + repository) - logger.debug("baseURL:" + baseURL) if(!repository.endsWith(".wiki")){ - receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, pusher, baseURL)) + receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, pusher, baseUrl(request))) } receivePack } @@ -79,7 +77,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] import scala.collection.JavaConverters._ -class CommitLogHook(owner: String, repository: String, pusher: String, baseURL: String) extends PostReceiveHook +class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String) extends PostReceiveHook with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService { private val logger = LoggerFactory.getLogger(classOf[CommitLogHook]) @@ -148,7 +146,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseURL: case webHookURLs if(webHookURLs.nonEmpty) => for(pusherAccount <- getAccountByUserName(pusher); ownerAccount <- getAccountByUserName(owner); - repositoryInfo <- getRepository(owner, repository, baseURL)){ + repositoryInfo <- getRepository(owner, repository, baseUrl)){ callWebHook(owner, repository, webHookURLs, WebHookPayload(git, pusherAccount, command.getRefName, repositoryInfo, newCommits, ownerAccount)) } @@ -181,7 +179,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseURL: */ private def updatePullRequests(branch: String) = getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq => - if(getRepository(pullreq.userName, pullreq.repositoryName, baseURL).isDefined){ + if(getRepository(pullreq.userName, pullreq.repositoryName, baseUrl).isDefined){ using(Git.open(Directory.getRepositoryDir(pullreq.userName, pullreq.repositoryName))){ git => git.fetch .setRemote(Directory.getRepositoryDir(owner, repository).toURI.toString) From 590b431ec1e0396f19fd7ac52e1a26c6cb990298 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 13:27:36 +0900 Subject: [PATCH 19/30] Add FlashMapSupport to ControllerBase. --- src/main/scala/app/AccountController.scala | 3 +-- src/main/scala/app/ControllerBase.scala | 3 ++- src/main/scala/app/FileUploadController.scala | 3 +-- src/main/scala/app/IndexController.scala | 1 + src/main/scala/app/RepositorySettingsController.scala | 3 +-- src/main/scala/app/SystemSettingsController.scala | 3 +-- src/main/scala/app/WikiController.scala | 9 +++------ 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala index 5bea0b4bc..df24aad3f 100644 --- a/src/main/scala/app/AccountController.scala +++ b/src/main/scala/app/AccountController.scala @@ -5,13 +5,12 @@ import util.{FileUtil, OneselfAuthenticator} import util.StringUtil._ import util.Directory._ import jp.sf.amateras.scalatra.forms._ -import org.scalatra.FlashMapSupport import org.apache.commons.io.FileUtils class AccountController extends AccountControllerBase with AccountService with RepositoryService with ActivityService with OneselfAuthenticator -trait AccountControllerBase extends AccountManagementControllerBase with FlashMapSupport { +trait AccountControllerBase extends AccountManagementControllerBase { self: AccountService with RepositoryService with ActivityService with OneselfAuthenticator => case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String, diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index 0bf4676c4..d1e39e8bd 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -20,7 +20,8 @@ import org.scalatra.i18n._ * Provides generic features for controller implementations. */ abstract class ControllerBase extends ScalatraFilter - with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with Validations with SystemSettingsService { + with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations + with SystemSettingsService { implicit val jsonFormats = DefaultFormats diff --git a/src/main/scala/app/FileUploadController.scala b/src/main/scala/app/FileUploadController.scala index 6ea5fa23c..9950b4850 100644 --- a/src/main/scala/app/FileUploadController.scala +++ b/src/main/scala/app/FileUploadController.scala @@ -12,8 +12,7 @@ import org.apache.commons.io.FileUtils * This servlet saves uploaded file as temporary file and returns the unique id. * You can get uploaded file using [[app.FileUploadControllerBase#getTemporaryFile()]] with this id. */ -class FileUploadController extends ScalatraServlet - with FileUploadSupport with FlashMapSupport with FileUploadControllerBase { +class FileUploadController extends ScalatraServlet with FileUploadSupport with FileUploadControllerBase { configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024))) diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala index 2ee96bdf9..92ee29159 100644 --- a/src/main/scala/app/IndexController.scala +++ b/src/main/scala/app/IndexController.scala @@ -31,6 +31,7 @@ trait IndexControllerBase extends ControllerBase { get("/signin"){ val redirect = params.get("redirect") if(redirect.isDefined && redirect.get.startsWith("/")){ + session.setAttribute(Keys.Session.Redirect, redirect.get) } html.signin(loadSystemSettings()) diff --git a/src/main/scala/app/RepositorySettingsController.scala b/src/main/scala/app/RepositorySettingsController.scala index d745623eb..3f5489a96 100644 --- a/src/main/scala/app/RepositorySettingsController.scala +++ b/src/main/scala/app/RepositorySettingsController.scala @@ -5,7 +5,6 @@ import util.Directory._ import util.{UsersAuthenticator, OwnerAuthenticator} import jp.sf.amateras.scalatra.forms._ import org.apache.commons.io.FileUtils -import org.scalatra.FlashMapSupport import org.scalatra.i18n.Messages import service.WebHookService.WebHookPayload import util.JGitUtil.CommitInfo @@ -16,7 +15,7 @@ class RepositorySettingsController extends RepositorySettingsControllerBase with RepositoryService with AccountService with WebHookService with OwnerAuthenticator with UsersAuthenticator -trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSupport { +trait RepositorySettingsControllerBase extends ControllerBase { self: RepositoryService with AccountService with WebHookService with OwnerAuthenticator with UsersAuthenticator => diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala index 08231b6da..c6f56fe34 100644 --- a/src/main/scala/app/SystemSettingsController.scala +++ b/src/main/scala/app/SystemSettingsController.scala @@ -4,12 +4,11 @@ import service.{AccountService, SystemSettingsService} import SystemSettingsService._ import util.AdminAuthenticator import jp.sf.amateras.scalatra.forms._ -import org.scalatra.FlashMapSupport class SystemSettingsController extends SystemSettingsControllerBase with SystemSettingsService with AccountService with AdminAuthenticator -trait SystemSettingsControllerBase extends ControllerBase with FlashMapSupport { +trait SystemSettingsControllerBase extends ControllerBase { self: SystemSettingsService with AccountService with AdminAuthenticator => private val form = mapping( diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala index 704ce20a8..07208a5dd 100644 --- a/src/main/scala/app/WikiController.scala +++ b/src/main/scala/app/WikiController.scala @@ -6,18 +6,15 @@ import util.Directory._ import util.ControlUtil._ import jp.sf.amateras.scalatra.forms._ import org.eclipse.jgit.api.Git -import org.scalatra.FlashMapSupport import org.scalatra.i18n.Messages import scala.Some import java.util.ResourceBundle class WikiController extends WikiControllerBase - with WikiService with RepositoryService with AccountService with ActivityService - with CollaboratorsAuthenticator with ReferrerAuthenticator + with WikiService with RepositoryService with AccountService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator -trait WikiControllerBase extends ControllerBase with FlashMapSupport { - self: WikiService with RepositoryService with ActivityService - with CollaboratorsAuthenticator with ReferrerAuthenticator => +trait WikiControllerBase extends ControllerBase { + self: WikiService with RepositoryService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator => case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String) From 17f581f654bad4fcb52f377f9246a7c778b63f2a Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 15:19:42 +0900 Subject: [PATCH 20/30] (refs #279)Override ScalatraBase#fullUrl() to apply the configured base url to redirection. --- src/main/scala/app/ControllerBase.scala | 16 +++++++++++----- src/main/scala/app/IndexController.scala | 6 ++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index d1e39e8bd..cf91fea25 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -103,15 +103,21 @@ abstract class ControllerBase extends ScalatraFilter if(request.getMethod.toUpperCase == "POST"){ org.scalatra.Unauthorized(redirect("/signin")) } else { - val currentUrl = baseUrl + defining(request.getQueryString){ queryString => - request.getRequestURI.substring(request.getContextPath.length) + (if(queryString != null) "?" + queryString else "") - } - session.setAttribute(Keys.Session.Redirect, currentUrl) - org.scalatra.Unauthorized(redirect("/signin")) + org.scalatra.Unauthorized(redirect("/signin?redirect=" + StringUtil.urlEncode( + defining(request.getQueryString){ queryString => + request.getRequestURI.substring(request.getContextPath.length) + (if(queryString != null) "?" + queryString else "") + } + ))) } } } + override def fullUrl(path: String, params: Iterable[(String, Any)] = Iterable.empty, + includeContextPath: Boolean = true, includeServletPath: Boolean = true) + (implicit request: HttpServletRequest, response: HttpServletResponse) = + if (path.startsWith("http")) path + else baseUrl + url(path, params, includeContextPath, includeServletPath) + } /** diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala index 92ee29159..0e46b3c46 100644 --- a/src/main/scala/app/IndexController.scala +++ b/src/main/scala/app/IndexController.scala @@ -1,7 +1,6 @@ package app import util._ -import util.Implicits._ import service._ import jp.sf.amateras.scalatra.forms._ @@ -31,8 +30,7 @@ trait IndexControllerBase extends ControllerBase { get("/signin"){ val redirect = params.get("redirect") if(redirect.isDefined && redirect.get.startsWith("/")){ - - session.setAttribute(Keys.Session.Redirect, redirect.get) + flash += Keys.Flash.Redirect -> redirect.get } html.signin(loadSystemSettings()) } @@ -56,7 +54,7 @@ trait IndexControllerBase extends ControllerBase { session.setAttribute(Keys.Session.LoginAccount, account) updateLastLoginDate(account.userName) - session.getAndRemove[String](Keys.Session.Redirect).map { redirectUrl => + flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl => if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){ redirect("/") } else { From 374893a5aed0dab2715469c2fd04518db1a14c2f Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 15:22:58 +0900 Subject: [PATCH 21/30] Apply scala.util.control.Exception to exception handling. --- src/main/scala/util/ControlUtil.scala | 6 ++---- src/main/scala/util/Implicits.scala | 7 +++---- src/main/scala/util/Keys.scala | 21 +++++++++++++++------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/main/scala/util/ControlUtil.scala b/src/main/scala/util/ControlUtil.scala index 02d7fd189..af8db88e0 100644 --- a/src/main/scala/util/ControlUtil.scala +++ b/src/main/scala/util/ControlUtil.scala @@ -3,7 +3,7 @@ package util import org.eclipse.jgit.api.Git import org.eclipse.jgit.revwalk.RevWalk import org.eclipse.jgit.treewalk.TreeWalk -import org.eclipse.jgit.transport.RefSpec +import scala.util.control.Exception._ import scala.language.reflectiveCalls /** @@ -16,10 +16,8 @@ object ControlUtil { def using[A <% { def close(): Unit }, B](resource: A)(f: A => B): B = try f(resource) finally { if(resource != null){ - try { + allCatch { resource.close() - } catch { - case e: Throwable => // ignore } } } diff --git a/src/main/scala/util/Implicits.scala b/src/main/scala/util/Implicits.scala index a9e648c45..77c095ef9 100644 --- a/src/main/scala/util/Implicits.scala +++ b/src/main/scala/util/Implicits.scala @@ -1,6 +1,7 @@ package util import scala.util.matching.Regex +import scala.util.control.Exception._ import javax.servlet.http.{HttpSession, HttpServletRequest} /** @@ -42,10 +43,8 @@ object Implicits { sb.toString } - def toIntOpt: Option[Int] = try { - Option(Integer.parseInt(value)) - } catch { - case e: NumberFormatException => None + def toIntOpt: Option[Int] = catching(classOf[NumberFormatException]) opt { + Integer.parseInt(value) } } diff --git a/src/main/scala/util/Keys.scala b/src/main/scala/util/Keys.scala index 4aabe3555..920dfca3a 100644 --- a/src/main/scala/util/Keys.scala +++ b/src/main/scala/util/Keys.scala @@ -13,12 +13,7 @@ object Keys { /** * Session key for the logged in account information. */ - val LoginAccount = "LOGIN_ACCOUNT" - - /** - * Session key for the redirect URL. - */ - val Redirect = "REDIRECT" + val LoginAccount = "loginAccount" /** * Session key for the issue search condition in dashboard. @@ -47,6 +42,20 @@ object Keys { } + object Flash { + + /** + * Flash key for the redirect URL. + */ + val Redirect = "redirect" + + /** + * Flash key for the information message. + */ + val Info = "info" + + } + /** * Define request keys. */ From e97b5c3c89cc8f9711ea40d5bce58ec51537e186 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 15:24:55 +0900 Subject: [PATCH 22/30] (refs #279)Remove --https option because it's possible to substitute in the base url configuration. --- README.md | 4 ++-- src/main/java/JettyLauncher.java | 20 +------------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index fa6718dc6..6ccf9af0d 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ or you can start GitBucket by `java -jar gitbucket.war` without servlet containe - --port=[NUMBER] - --prefix=[CONTEXTPATH] - --host=[HOSTNAME] -- --https=true - --gitbucket.home=[DATA_DIR] To upgrade GitBucket, only replace gitbucket.war. All GitBucket data is stored in HOME/.gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk. @@ -60,7 +59,8 @@ Run the following commands in `Terminal` to Release Notes -------- ### 1.11 - End of Feb 2014 -- Base URL for redirect, notification and repository URL box is configurable +- Base URL for redirection, notification and repository URL box is configurable +- Remove ```--https``` option because it's possible to substitute in the base url - Headline anchor is available for Markdown contents such as Wiki page - Improve H2 connectivity - Label is available for pull requests not only issues diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index d7b137d6f..76500f045 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -25,8 +25,6 @@ public class JettyLauncher { port = Integer.parseInt(dim[1]); } else if(dim[0].equals("--prefix")) { contextPath = dim[1]; - } else if(dim[0].equals("--https") && (dim[1].equals("1") || dim[1].equals("true"))) { - forceHttps = true; } else if(dim[0].equals("--gitbucket.home")){ System.setProperty("gitbucket.home", dim[1]); } @@ -36,7 +34,7 @@ public class JettyLauncher { Server server = new Server(); - HttpsSupportConnector connector = new HttpsSupportConnector(forceHttps); + SelectChannelConnector connector = new SelectChannelConnector(); if(host != null) { connector.setHost(host); } @@ -62,19 +60,3 @@ public class JettyLauncher { server.join(); } } - -class HttpsSupportConnector extends SelectChannelConnector { - private boolean forceHttps; - - public HttpsSupportConnector(boolean forceHttps) { - this.forceHttps = forceHttps; - } - - @Override - public void customize(final EndPoint endpoint, final Request request) throws IOException { - if (this.forceHttps) { - request.setScheme("https"); - super.customize(endpoint, request); - } - } -} From 153244c3904b676441bb13b2fddf68c0257f60b1 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 1 Mar 2014 15:26:10 +0900 Subject: [PATCH 23/30] Update README.mf for GitBucket 1.11 release --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ccf9af0d..41c57d1a8 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Run the following commands in `Terminal` to Release Notes -------- -### 1.11 - End of Feb 2014 +### 1.11 - 01 Mar 2014 - Base URL for redirection, notification and repository URL box is configurable - Remove ```--https``` option because it's possible to substitute in the base url - Headline anchor is available for Markdown contents such as Wiki page From 31b21d74b112fea8b3527bae2dfb747e2b2815ac Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Mar 2014 00:25:56 +0900 Subject: [PATCH 24/30] Remove --https option. --- contrib/redhat/gitbucket.conf | 3 --- contrib/redhat/gitbucket.init | 3 --- 2 files changed, 6 deletions(-) diff --git a/contrib/redhat/gitbucket.conf b/contrib/redhat/gitbucket.conf index c3959f36e..103778ec6 100644 --- a/contrib/redhat/gitbucket.conf +++ b/contrib/redhat/gitbucket.conf @@ -4,9 +4,6 @@ # Server port #GITBUCKET_PORT=8080 -# Force HTTPS scheme -#GITBUCKET_HTTPS=false - # Data directory (GITBUCKET_HOME/gitbucket) #GITBUCKET_HOME=/var/lib/gitbucket diff --git a/contrib/redhat/gitbucket.init b/contrib/redhat/gitbucket.init index 3aed80262..43e29e3e9 100644 --- a/contrib/redhat/gitbucket.init +++ b/contrib/redhat/gitbucket.init @@ -39,9 +39,6 @@ start() { if [ $GITBUCKET_HOST ]; then START_OPTS="${START_OPTS} --host=${GITBUCKET_HOST}" fi - if [ $GITBUCKET_HTTPS ]; then - START_OPTS="${START_OPTS} --https=true" - fi # Run the Java process GITBUCKET_HOME="${GITBUCKET_HOME}" java $GITBUCKET_JVM_OPTS -jar $GITBUCKET_WAR_FILE $START_OPTS >>$LOG_FILE 2>&1 & From 0fa1922bb060bfa18cea32bfdf8db7e839e0470e Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Mar 2014 01:05:42 +0900 Subject: [PATCH 25/30] Small fix to pull request #289 --- src/main/twirl/header.scala.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html index 965fa9381..55f19eec9 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/header.scala.html @@ -29,13 +29,10 @@ } } - - - @if(repository.repository.description != "") { -

@repository.repository.description

- } - +@repository.repository.description.map { description => +

@description

+}
From 94576a876a716818b6da89a3b2f6e9acb7c4da21 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Mar 2014 01:23:30 +0900 Subject: [PATCH 26/30] (refs #280)Commit count limitation is changed to 10000 from 1000. --- src/main/scala/util/JGitUtil.scala | 2 +- src/main/twirl/repo/files.scala.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/util/JGitUtil.scala b/src/main/scala/util/JGitUtil.scala index 742641e62..57fd42192 100644 --- a/src/main/scala/util/JGitUtil.scala +++ b/src/main/scala/util/JGitUtil.scala @@ -128,7 +128,7 @@ object JGitUtil { using(Git.open(getRepositoryDir(owner, repository))){ git => try { // get commit count - val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(1000).sum + val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(10000).sum RepositoryInfo( owner, repository, s"${baseUrl}/git/${owner}/${repository}.git", diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 823298ec7..355a393c0 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -12,7 +12,7 @@
@defining(repository.commitCount){ commitCount => - @if(commitCount > 1000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")  + @if(commitCount > 10000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")  }
@repository.name / From 7701521a2e0fe80986fc2a4b6c8f64ed7cd7b50b Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Mar 2014 04:24:24 +0900 Subject: [PATCH 27/30] Fix to use Exception#ignoring to ignore Exception. --- src/main/scala/util/ControlUtil.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/util/ControlUtil.scala b/src/main/scala/util/ControlUtil.scala index af8db88e0..0b0f7123b 100644 --- a/src/main/scala/util/ControlUtil.scala +++ b/src/main/scala/util/ControlUtil.scala @@ -16,7 +16,7 @@ object ControlUtil { def using[A <% { def close(): Unit }, B](resource: A)(f: A => B): B = try f(resource) finally { if(resource != null){ - allCatch { + ignoring(classOf[Throwable]) { resource.close() } } From b031103df8d7109f727a1dfc903f4c6caf93e011 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Mar 2014 04:49:14 +0900 Subject: [PATCH 28/30] (refs #218)Separate StringUtil#extractCloseId() to add unit test. --- .../scala/app/PullRequestsController.scala | 2 +- src/main/scala/service/IssuesService.scala | 13 +++++-------- .../scala/servlet/GitRepositoryServlet.scala | 2 +- src/main/scala/util/StringUtil.scala | 15 ++++++++++++--- src/test/scala/util/StringUtilSpec.scala | 18 ++++++++++++++++++ 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 5a3317dc2..bf3bea268 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -79,7 +79,7 @@ trait PullRequestsControllerBase extends ControllerBase { pulls.html.pullreq( issue, pullreq, getComments(owner, name, issueId), - getIssueLabels(owner, name, issueId.toInt), + getIssueLabels(owner, name, issueId), (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted, getMilestonesWithIssueCount(owner, name), getLabels(owner, name), diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index 81a9bf85e..b1215995f 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -8,6 +8,7 @@ import Q.interpolation import model._ import util.Implicits._ import util.StringUtil._ +import util.StringUtil trait IssuesService { import IssuesService._ @@ -315,14 +316,10 @@ trait IssuesService { } def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = { - val regex = "(?i)(? - getIssue(owner, repository, issueId) match { - case Some(issue) if !issue.closed => { - createComment(owner, repository, userName, issue.issueId, "Close", "close") - updateClosed(owner, repository, issue.issueId, true) - } - case _ => + StringUtil.extractCloseId(message).foreach { issueId => + for(issue <- getIssue(owner, repository, issueId) if !issue.closed){ + createComment(owner, repository, userName, issue.issueId, "Close", "close") + updateClosed(owner, repository, issue.issueId, true) } } } diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index e1a00d783..9efefd35f 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -142,7 +142,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: } // close issues - val defaultBranch = getRepository(owner, repository, baseURL).get.repository.defaultBranch + val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){ git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach { commit => closeIssuesFromMessage(commit.getFullMessage, pusher, owner, repository) diff --git a/src/main/scala/util/StringUtil.scala b/src/main/scala/util/StringUtil.scala index 7de2a62d6..54da0294d 100644 --- a/src/main/scala/util/StringUtil.scala +++ b/src/main/scala/util/StringUtil.scala @@ -31,7 +31,7 @@ object StringUtil { /** * Make string from byte array. Character encoding is detected automatically by [[util.StringUtil.detectEncoding]]. - * And if given bytes contains UTF-8 BOM, it's removed from returned string.. + * And if given bytes contains UTF-8 BOM, it's removed from returned string. */ def convertFromByteArray(content: Array[Byte]): String = IOUtils.toString(new BOMInputStream(new java.io.ByteArrayInputStream(content)), detectEncoding(content)) @@ -47,12 +47,21 @@ object StringUtil { } /** - * Extract issue id like ````#issueId``` from the given message. + * Extract issue id like ```#issueId``` from the given message. * *@param message the message which may contains issue id * @return the iterator of issue id */ def extractIssueId(message: String): Iterator[String] = - "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(message).matchData.map { matchData => matchData.group(2) } + "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(message).matchData.map(_.group(2)) + + /** + * Extract close issue id like ```close #issueId ``` from the given message. + * + * @param message the message which may contains close command + * @return the iterator of issue id + */ + def extractCloseId(message: String): Iterator[String] = + "(?i)(? Date: Sun, 2 Mar 2014 23:55:03 +0900 Subject: [PATCH 29/30] (refs #279)Fix redirect url generation. --- src/main/scala/app/ControllerBase.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala index cf91fea25..5e60eb42c 100644 --- a/src/main/scala/app/ControllerBase.scala +++ b/src/main/scala/app/ControllerBase.scala @@ -116,7 +116,7 @@ abstract class ControllerBase extends ScalatraFilter includeContextPath: Boolean = true, includeServletPath: Boolean = true) (implicit request: HttpServletRequest, response: HttpServletResponse) = if (path.startsWith("http")) path - else baseUrl + url(path, params, includeContextPath, includeServletPath) + else baseUrl + url(path, params, false, false) } From 527fd94145f86f5e72f07133e1d71d4deb7847a4 Mon Sep 17 00:00:00 2001 From: eiryu Date: Mon, 3 Mar 2014 00:28:48 +0900 Subject: [PATCH 30/30] fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41c57d1a8..43470be57 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Following features are not implemented, but we will make them in the future rele - File editing in repository viewer - Comment for the changeset - Network graph -- Statics +- Statistics - Watch / Star If you want to try the development version of GitBucket, see the documentation for developers at [Wiki](https://github.com/takezoe/gitbucket/wiki).