From a07cc30e0b76effc446c3761593baa16e34311c1 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 25 Feb 2017 07:19:07 +0900 Subject: [PATCH 001/179] Add travis badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 181a9c0..9f2bd89 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# gitbucket-gist-plugin +# gitbucket-gist-plugin [![Build Status](https://travis-ci.org/gitbucket/gitbucket-gist-plugin.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket-gist-plugin) This is an example of GitBucket plug-in. This plug-in provides code snippet repository like Gist. From 28b09929ff3a2a5b7f095ebd24244d7c238d0c9c Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Sat, 25 Feb 2017 16:46:44 +0900 Subject: [PATCH 002/179] add jcenter resolver ``` [warn] Note: Unresolved dependencies path: [warn] com.github.bkromhout:java-diff-utils:2.1.1 [warn] +- io.github.gitbucket:gitbucket_2.12:4.10.0 (/home/travis/build/gitbucket/gitbucket-gist-plugin/build.sbt#L12-17) [warn] +- io.github.gitbucket:gitbucket-gist-plugin_2.12:4.6.0 sbt.ResolveException: unresolved dependency: com.github.bkromhout#java-diff-utils;2.1.1: not found at sbt.IvyActions$.sbt$IvyActions$$resolve(IvyActions.scala:313) ``` https://travis-ci.org/gitbucket/gitbucket-gist-plugin/builds/205136180#L661 --- build.sbt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sbt b/build.sbt index e6d8613..79d21cb 100644 --- a/build.sbt +++ b/build.sbt @@ -17,3 +17,5 @@ libraryDependencies ++= Seq( scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps", "-Ydelambdafy:method", "-target:jvm-1.8") javacOptions in compile ++= Seq("-target", "8", "-source", "8") + +useJCenter := true From d4bc2e31ca3f1501c1418b8b5c0033e888a68237 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Fri, 10 Mar 2017 02:23:01 +0900 Subject: [PATCH 003/179] Update scalac option --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 79d21cb..1139c68 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ libraryDependencies ++= Seq( "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided" ) -scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps", "-Ydelambdafy:method", "-target:jvm-1.8") +scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps", "-opt:_") javacOptions in compile ++= Seq("-target", "8", "-source", "8") useJCenter := true From d77e7fc6b6eb1919f0289eb8718c0793e391e870 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 13 Mar 2017 11:26:36 +0900 Subject: [PATCH 004/179] Remove optimization option once --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1139c68..cf004e0 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ libraryDependencies ++= Seq( "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided" ) -scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps", "-opt:_") +scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") javacOptions in compile ++= Seq("-target", "8", "-source", "8") useJCenter := true From c2d1396dd3ad0c735984832af6ba7c717fad964d Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 1 Apr 2017 13:22:58 +0900 Subject: [PATCH 005/179] Bump to GitBucket 4.11 --- build.sbt | 2 +- src/main/scala/gitbucket/gist/controller/GistController.scala | 2 +- src/main/scala/gitbucket/gist/util/GistAuthenticator.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index cf004e0..1f3754b 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ version := ProjectVersion scalaVersion := "2.12.1" libraryDependencies ++= Seq( - "io.github.gitbucket" %% "gitbucket" % "4.10.0" % "provided", + "io.github.gitbucket" %% "gitbucket" % "4.11.0" % "provided", "com.typesafe.play" %% "twirl-compiler" % "1.3.0" % "provided", "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided" ) diff --git a/src/main/scala/gitbucket/gist/controller/GistController.scala b/src/main/scala/gitbucket/gist/controller/GistController.scala index 3c7a2c5..c8be216 100644 --- a/src/main/scala/gitbucket/gist/controller/GistController.scala +++ b/src/main/scala/gitbucket/gist/controller/GistController.scala @@ -9,7 +9,7 @@ import gitbucket.core.service.AccountService import gitbucket.core.service.RepositoryService.RepositoryInfo import gitbucket.core.util._ import gitbucket.core.util.Directory._ -import gitbucket.core.util.ControlUtil._ +import gitbucket.core.util.SyntaxSugars._ import gitbucket.core.util.Implicits._ import gitbucket.core.view.helpers._ diff --git a/src/main/scala/gitbucket/gist/util/GistAuthenticator.scala b/src/main/scala/gitbucket/gist/util/GistAuthenticator.scala index 9db97b0..443ded4 100644 --- a/src/main/scala/gitbucket/gist/util/GistAuthenticator.scala +++ b/src/main/scala/gitbucket/gist/util/GistAuthenticator.scala @@ -1,7 +1,7 @@ package gitbucket.gist.util import gitbucket.core.controller.ControllerBase -import gitbucket.core.util.ControlUtil._ +import gitbucket.core.util.SyntaxSugars._ import gitbucket.core.util.Implicits._ /** From ace1b5495e08b816746c8f7c9a260c17fc38a458 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 1 Apr 2017 13:24:20 +0900 Subject: [PATCH 006/179] 4.7.0 release --- README.md | 1 + build.sbt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f2bd89..aa98c89 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ This is an example of GitBucket plug-in. This plug-in provides code snippet repo Plugin version | GitBucket version :--------------|:-------------------- +4.7.x | 4.11.x 4.6.x | 4.10.x 4.5.x | 4.9.x 4.4.x | 4.8.x diff --git a/build.sbt b/build.sbt index 1f3754b..dff9f28 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ val Organization = "io.github.gitbucket" val ProjectName = "gitbucket-gist-plugin" -val ProjectVersion = "4.6.0" +val ProjectVersion = "4.7.0" lazy val root = (project in file(".")).enablePlugins(SbtTwirl) From 21a446eb21934e7ca32b181fdbf80ab26ae2e4d0 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 1 Apr 2017 13:34:37 +0900 Subject: [PATCH 007/179] Fix warnings --- src/main/twirl/gitbucket/gist/commentpreview.scala.html | 4 ++-- src/main/twirl/gitbucket/gist/edit.scala.html | 8 ++++---- src/main/twirl/gitbucket/gist/revisions.scala.html | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/twirl/gitbucket/gist/commentpreview.scala.html b/src/main/twirl/gitbucket/gist/commentpreview.scala.html index f2e5953..66d4e38 100644 --- a/src/main/twirl/gitbucket/gist/commentpreview.scala.html +++ b/src/main/twirl/gitbucket/gist/commentpreview.scala.html @@ -28,9 +28,9 @@ } $('#preview@uid').click(function(){ - $('#preview-area@uid').html(' Previewing...'); + $('#preview-area@uid').html(' Previewing...'); $.post('@context.path/gist/@gist.userName/@gist.repositoryName/_preview', { - content : $('#content@uid').val() + content: $('#content@uid').val() }, function(data){ $('#preview-area@uid').html(data); prettyPrint(); diff --git a/src/main/twirl/gitbucket/gist/edit.scala.html b/src/main/twirl/gitbucket/gist/edit.scala.html index 4895eef..3671592 100644 --- a/src/main/twirl/gitbucket/gist/edit.scala.html +++ b/src/main/twirl/gitbucket/gist/edit.scala.html @@ -74,10 +74,10 @@

New snippet

- - - - + + + + - - + + + "} @menuitem(name: String, path: String, label: String, count: Int = 0) = {
  • @@ -32,33 +32,60 @@ "Forks") } -
    - HTTP clone URL -
    +
    +
    +
    + + +
    @gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", repositoryUrl.httpUrl){ } - @if(context.settings.ssh && context.loginAccount.isDefined){ -
    - You can clone HTTP or SSH. -
    - } +
    Download ZIP + class="btn btn-default btn-block">Download ZIP
    -@if(context.settings.ssh && context.loginAccount.isDefined){ + -} From 9c15c42b8da1a317e4f672ad7b4c134b1a7b1520 Mon Sep 17 00:00:00 2001 From: YT Date: Tue, 18 Apr 2017 21:38:20 +0900 Subject: [PATCH 010/179] modified code as review comment --- .../gist/controller/GistController.scala | 25 +++++++++++-------- src/main/twirl/gitbucket/gist/detail.scala.js | 16 ++++-------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/main/scala/gitbucket/gist/controller/GistController.scala b/src/main/scala/gitbucket/gist/controller/GistController.scala index 06cafff..55ade11 100644 --- a/src/main/scala/gitbucket/gist/controller/GistController.scala +++ b/src/main/scala/gitbucket/gist/controller/GistController.scala @@ -70,6 +70,17 @@ trait GistControllerBase extends ControllerBase { _gist(params("userName"), Some(params("repoName"))) } + get("/gist/:userName/:repoName.js"){ + val userName = params("userName") + val repoName = params("repoName") + getGist(userName, repoName) match { + case Some(gist) => + _embedJs(gist, userName, repoName, "master") + case None => + NotFound() + } + } + get("/gist/:userName/:repoName/:revision"){ _gist(params("userName"), Some(params("repoName")), params("revision")) } @@ -417,12 +428,7 @@ trait GistControllerBase extends ControllerBase { //////////////////////////////////////////////////////////////////////////////// - private def _gist(userName: String, repoName: Option[String] = None, revision: String = "master", isEmbed: Boolean = false): Any = { - - if( repoName.isDefined && repoName.get.endsWith(".js")) { - return _gist(userName, Some(repoName.get.substring(0,repoName.get.length()-3)), revision, true) - } - + private def _gist(userName: String, repoName: Option[String] = None, revision: String = "master"): Any = { repoName match { case None => { val page = params.get("page") match { @@ -450,14 +456,11 @@ trait GistControllerBase extends ControllerBase { case Some(gist) => if(gist.mode == "PRIVATE"){ context.loginAccount match { - case Some(x) if(x.userName == userName) => - if(isEmbed) _embedJs(gist, userName, repoName, revision) - else _gistDetail(gist, userName, repoName, revision) + case Some(x) if(x.userName == userName) => _gistDetail(gist, userName, repoName, revision) case _ => Unauthorized() } } else { - if(isEmbed) _embedJs(gist, userName, repoName, revision) - else _gistDetail(gist, userName, repoName, revision) + _gistDetail(gist, userName, repoName, revision) } case None => NotFound() diff --git a/src/main/twirl/gitbucket/gist/detail.scala.js b/src/main/twirl/gitbucket/gist/detail.scala.js index 730c2ff..39773d9 100644 --- a/src/main/twirl/gitbucket/gist/detail.scala.js +++ b/src/main/twirl/gitbucket/gist/detail.scala.js @@ -4,12 +4,6 @@ files: Seq[(String, String)] )(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers -@import play.twirl.api.Html -@bootstrapCSS={} -@prettifyCSS={} -@gistCSS={} -@gitbucketCSS={} -@adminLTECSS={} jqueryScript = document.createElement('script'); jqueryScript.src = '@helpers.assets("/vendors/jquery/jquery-1.12.2.min.js")'; document.head.appendChild(jqueryScript); @@ -52,9 +46,9 @@ var _html = (function () {/*4f85e035-2513-453b-b435-33f0a12b2339 4f85e035-2513-453b-b435-33f0a12b2339*/}).toString().replace(/(\n)/g, '').split('4f85e035-2513-453b-b435-33f0a12b2339')[1]; -document.write('@bootstrapCSS'); -document.write('@prettifyCSS'); -document.write('@gistCSS'); -document.write('@gitbucketCSS'); -document.write('@adminLTECSS'); +document.write(''); +document.write(''); +document.write(''); +document.write(''); +document.write(''); document.write(_html.replace(/\\r\\n/g,"\n").replace(/\\/g,"")); From 5109f9646ca7a29e3993faa0b27791ba18827378 Mon Sep 17 00:00:00 2001 From: YT Date: Wed, 19 Apr 2017 20:03:47 +0900 Subject: [PATCH 011/179] use word 'snippet' to match in menu 'snippets' --- src/main/twirl/gitbucket/gist/menu.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/gitbucket/gist/menu.scala.html b/src/main/twirl/gitbucket/gist/menu.scala.html index 77ec919..019a449 100644 --- a/src/main/twirl/gitbucket/gist/menu.scala.html +++ b/src/main/twirl/gitbucket/gist/menu.scala.html @@ -42,7 +42,7 @@
  • Embed
    - Embed this gist in your website. + Embed this snippet in your website.
  • From feaf36424ac25c5d4737327752e98f4442e0e32a Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Thu, 20 Apr 2017 11:10:25 +0900 Subject: [PATCH 012/179] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aa98c89..f2247a8 100644 --- a/README.md +++ b/README.md @@ -34,5 +34,5 @@ See [Connect to H2 database](https://github.com/gitbucket/gitbucket/wiki/Connect ## Build from source 1. Hit `./sbt.sh package` in the root directory of this repository. -2. Copy `target/scala-2.11/gitbucket-gist-plugin_2.11-x.x.x.jar` into `GITBUCKET_HOME/plugins`. +2. Copy `target/scala-2.11/gitbucket-gist-plugin_2.12-x.x.x.jar` into `GITBUCKET_HOME/plugins`. 3. Restart GitBucket. From aa90e644ecb539ef9f0b6f6a8d45c898dc41f53c Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Thu, 20 Apr 2017 14:04:17 +0900 Subject: [PATCH 013/179] Fix "} @menuitem(name: String, path: String, label: String, count: Int = 0) = {
  • @@ -74,15 +72,18 @@ +} +}); + diff --git a/src/main/twirl/gitbucket/gist/revisions.scala.html b/src/main/twirl/gitbucket/gist/revisions.scala.html index ffe0883..2c05623 100644 --- a/src/main/twirl/gitbucket/gist/revisions.scala.html +++ b/src/main/twirl/gitbucket/gist/revisions.scala.html @@ -11,7 +11,7 @@ @gitbucket.gist.html.header(gist, forkedCount, editable)
    @gitbucket.gist.html.menu("revision", gist, repositoryUrl) -
    +
    @revisions.map { case (revision, diffs) =>
    From 79103b78d52ce83a677100ca30d89012596e6549 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 14 Apr 2018 03:37:52 +0900 Subject: [PATCH 052/179] Remove a bottom border of the header --- src/main/twirl/gitbucket/gist/edit.scala.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/twirl/gitbucket/gist/edit.scala.html b/src/main/twirl/gitbucket/gist/edit.scala.html index 3671592..f5617d2 100644 --- a/src/main/twirl/gitbucket/gist/edit.scala.html +++ b/src/main/twirl/gitbucket/gist/edit.scala.html @@ -36,7 +36,6 @@

    New snippet

    } }
    -
    From 5a5a1ddfdcae514e8067f5c5887be5d455c3fe41 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 14 Apr 2018 19:05:36 +0900 Subject: [PATCH 053/179] (refs #47) Add remove file button --- .../gist/controller/GistController.scala | 22 ++++++------------- src/main/twirl/gitbucket/gist/edit.scala.html | 14 +++++++----- .../twirl/gitbucket/gist/editor.scala.html | 11 ++++++++-- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/main/scala/gitbucket/gist/controller/GistController.scala b/src/main/scala/gitbucket/gist/controller/GistController.scala index 15bc368..5b84a0d 100644 --- a/src/main/scala/gitbucket/gist/controller/GistController.scala +++ b/src/main/scala/gitbucket/gist/controller/GistController.scala @@ -100,7 +100,7 @@ trait GistControllerBase extends ControllerBase { post("/gist/_new")(usersOnly { if(context.loginAccount.isDefined){ val loginAccount = context.loginAccount.get - val files = getFileParameters(true) + val files = getFileParameters() if(files.isEmpty){ redirect(s"/gist") @@ -139,7 +139,7 @@ trait GistControllerBase extends ControllerBase { val repoName = params("repoName") val loginAccount = context.loginAccount.get - val files = getFileParameters(true) + val files = getFileParameters() val description = params("description") val mode = Mode.from(params("mode")) @@ -501,20 +501,12 @@ trait GistControllerBase extends ControllerBase { } } - private def getFileParameters(flatten: Boolean): Seq[(String, String)] = { + private def getFileParameters(): Seq[(String, String)] = { val count = params("count").toInt - if(flatten){ - (0 to count - 1).flatMap { i => - (params.get(s"fileName-${i}"), params.get(s"content-${i}")) match { - case (Some(fileName), Some(content)) if(content.nonEmpty) => Some((if(fileName.isEmpty) s"gistfile${i + 1}.txt" else fileName, content)) - case _ => None - } - } - } else { - (0 to count - 1).map { i => - val fileName = request.getParameter(s"fileName-${i}") - val content = request.getParameter(s"content-${i}") - (if(fileName.isEmpty) s"gistfile${i + 1}.txt" else fileName, content) + (0 to count - 1).flatMap { i => + (params.get(s"fileName-${i}"), params.get(s"content-${i}")) match { + case (Some(fileName), Some(content)) if(content.nonEmpty) => Some((if(fileName.isEmpty) s"gistfile${i + 1}.txt" else fileName, content)) + case _ => None } } } diff --git a/src/main/twirl/gitbucket/gist/edit.scala.html b/src/main/twirl/gitbucket/gist/edit.scala.html index f5617d2..fa29748 100644 --- a/src/main/twirl/gitbucket/gist/edit.scala.html +++ b/src/main/twirl/gitbucket/gist/edit.scala.html @@ -105,12 +105,14 @@

    New snippet

    } var value = null; for(var i = 0; i < count; i++){ - value = ace.edit('editor-' + i).getValue(); - if(value == ''){ - displayError('Files can\'t be empty.'); - return false; - } else { - $('#content-' + i).val(ace.edit('editor-' + i).getValue()); + if($('#editor-area-' + i).length == 1){ + value = ace.edit('editor-' + i).getValue(); + if(value == ''){ + displayError('Files can\'t be empty.'); + return false; + } else { + $('#content-' + i).val(ace.edit('editor-' + i).getValue()); + } } } return true; diff --git a/src/main/twirl/gitbucket/gist/editor.scala.html b/src/main/twirl/gitbucket/gist/editor.scala.html index 80670b1..6304640 100644 --- a/src/main/twirl/gitbucket/gist/editor.scala.html +++ b/src/main/twirl/gitbucket/gist/editor.scala.html @@ -2,7 +2,7 @@ fileName: String, content: gitbucket.core.util.JGitUtil.ContentInfo)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers -
    +
    - + +
    @@ -40,5 +41,11 @@ editor.getSession().setUseWrapMode(false); } }); + + $('#remove-@i').click(function(){ + if(confirm('Remove this file. Are you sure?')){ + $('#editor-area-@i').remove(); + } + }); }); From 0ba856bfc537b92ba5bc5f4ad290a5b10c7ab115 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 14 Apr 2018 19:10:36 +0900 Subject: [PATCH 054/179] (refs #47) At least one file is required --- src/main/twirl/gitbucket/gist/edit.scala.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/twirl/gitbucket/gist/edit.scala.html b/src/main/twirl/gitbucket/gist/edit.scala.html index fa29748..739e8d1 100644 --- a/src/main/twirl/gitbucket/gist/edit.scala.html +++ b/src/main/twirl/gitbucket/gist/edit.scala.html @@ -115,6 +115,10 @@

    New snippet

    } } } + if(value == null){ + displayError('At least one file is required.'); + return false; + } return true; }); From f82695aa148e6dc223076b265015d2533b0a75eb Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 14 Apr 2018 19:13:27 +0900 Subject: [PATCH 055/179] Tweak snippet's url box size --- src/main/twirl/gitbucket/gist/menu.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/gitbucket/gist/menu.scala.html b/src/main/twirl/gitbucket/gist/menu.scala.html index 4217619..7a2dfff 100644 --- a/src/main/twirl/gitbucket/gist/menu.scala.html +++ b/src/main/twirl/gitbucket/gist/menu.scala.html @@ -15,7 +15,7 @@     Download ZIP
    -
    +
    +
    - } -
    - -
    diff --git a/src/main/twirl/gitbucket/gist/revisions.scala.html b/src/main/twirl/gitbucket/gist/revisions.scala.html index 2c05623..f816193 100644 --- a/src/main/twirl/gitbucket/gist/revisions.scala.html +++ b/src/main/twirl/gitbucket/gist/revisions.scala.html @@ -8,67 +8,69 @@ @gitbucket.core.html.main(s"Revisions · ${gist.repositoryName}"){
    - @gitbucket.gist.html.header(gist, forkedCount, editable) -
    - @gitbucket.gist.html.menu("revision", gist, repositoryUrl) -
    - @revisions.map { case (revision, diffs) => -
    -
    - @helpers.avatar(revision, 20) @revision.authorName revised this @gitbucket.core.helper.html.datetimeago(revision.authorTime) -
    - @if(diffs.isEmpty){ - No changes. - } - @revision.id.substring(0, 7) -
    -
    +
    + @gitbucket.gist.html.header(gist, forkedCount, editable) +
    + @gitbucket.gist.html.menu("revision", gist, repositoryUrl) +
    + @revisions.map { case (revision, diffs) =>
    - @diffs.zipWithIndex.map { case (diff, i) => - - - - + +
    - @diff.changeType match { - case ChangeType.ADD => { - - - @diff.newPath - } - case ChangeType.MODIFY => { - - - @diff.newPath - } - case ChangeType.DELETE => { - - - @diff.oldPath +
    + @helpers.avatar(revision, 20) @revision.authorName revised this @gitbucket.core.helper.html.datetimeago(revision.authorTime) +
    + @if(diffs.isEmpty){ + No changes. + } + @revision.id.substring(0, 7) +
    +
    +
    + @diffs.zipWithIndex.map { case (diff, i) => + + + + + + + + + - - - - - - -
    + @diff.changeType match { + case ChangeType.ADD => { + + + @diff.newPath + } + case ChangeType.MODIFY => { + + + @diff.newPath + } + case ChangeType.DELETE => { + + + @diff.oldPath + } + case _ => { + } } - case _ => { +
    + @if(diff.newContent != None || diff.oldContent != None){ +
    + + + } else { + Not supported } - } - -
    - @if(diff.newContent != None || diff.oldContent != None){ -
    - - - } else { - Not supported - } -
    - } + +
    + } +
    -
    - } + } +
    From 267c146473382e71e15ccf9ff553e41690f0ef52 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 15 Apr 2018 12:19:48 +0900 Subject: [PATCH 057/179] Keep editor wrap mode as same as GitBucket core https://github.com/gitbucket/gitbucket/pull/1954 --- src/main/twirl/gitbucket/gist/editor.scala.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/twirl/gitbucket/gist/editor.scala.html b/src/main/twirl/gitbucket/gist/editor.scala.html index 6304640..d98ab92 100644 --- a/src/main/twirl/gitbucket/gist/editor.scala.html +++ b/src/main/twirl/gitbucket/gist/editor.scala.html @@ -30,6 +30,11 @@ var editor = ace.edit('editor-@i'); editor.setTheme("ace/theme/monokai"); + if(localStorage.getItem('gitbucket:editor:wrap') == 'true'){ + editor.getSession().setUseWrapMode(true); + $('#wrap-@i').val('true'); + } + @if(fileName.nonEmpty){ editor.getSession().setMode("ace/mode/@helpers.editorType(fileName)"); } @@ -37,8 +42,10 @@ $('#wrap-@i').change(function(){ if($('#wrap-@i option:selected').val() == 'true'){ editor.getSession().setUseWrapMode(true); + localStorage.setItem('gitbucket:editor:wrap', 'true'); } else { editor.getSession().setUseWrapMode(false); + localStorage.setItem('gitbucket:editor:wrap', 'false'); } }); From b073b83aae280c720f8a5cde80a587b68612262b Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 15 Apr 2018 12:40:50 +0900 Subject: [PATCH 058/179] Bump to 4.14.0 --- README.md | 2 +- build.sbt | 2 +- src/main/scala/Plugin.scala | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2ca305c..2b842bb 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This is a GitBucket plug-in which provides code snippet repository like Gist. Plugin version | GitBucket version :--------------|:-------------------- -4.13.x | 4.23.x - +4.13.x, 4.14.x | 4.23.x - 4.12.x | 4.21.x - 4.11.x | 4.19.x - 4.10.x | 4.15.x - 4.18.x diff --git a/build.sbt b/build.sbt index f0e5445..7c3c003 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" -version := "4.13.0" +version := "4.14.0" scalaVersion := "2.12.4" gitbucketVersion := "4.23.1" diff --git a/src/main/scala/Plugin.scala b/src/main/scala/Plugin.scala index e60405f..86106b5 100755 --- a/src/main/scala/Plugin.scala +++ b/src/main/scala/Plugin.scala @@ -35,7 +35,8 @@ class Plugin extends gitbucket.core.plugin.Plugin { new Version("4.10.0"), new Version("4.11.0"), new Version("4.12.0"), - new Version("4.13.0") + new Version("4.13.0"), + new Version("4.14.0") ) override def initialize(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = { From 4fe79f21ee890225cf06ea7fe2bc33b787abc7b4 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 16 Apr 2018 18:17:45 +0900 Subject: [PATCH 059/179] Add hash to the link to style.css --- src/main/twirl/gitbucket/gist/detail.scala.html | 2 +- src/main/twirl/gitbucket/gist/edit.scala.html | 9 +-------- src/main/twirl/gitbucket/gist/forks.scala.html | 2 +- src/main/twirl/gitbucket/gist/list.scala.html | 2 +- src/main/twirl/gitbucket/gist/revisions.scala.html | 2 +- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/twirl/gitbucket/gist/detail.scala.html b/src/main/twirl/gitbucket/gist/detail.scala.html index 32f0442..2b97ba3 100644 --- a/src/main/twirl/gitbucket/gist/detail.scala.html +++ b/src/main/twirl/gitbucket/gist/detail.scala.html @@ -7,7 +7,7 @@ editable: Boolean)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers @gitbucket.core.html.main(if(gist.description.isEmpty) gist.repositoryName else gist.description){ - +
    @gitbucket.gist.html.header(gist, forkedCount, editable) diff --git a/src/main/twirl/gitbucket/gist/edit.scala.html b/src/main/twirl/gitbucket/gist/edit.scala.html index f037268..259e997 100644 --- a/src/main/twirl/gitbucket/gist/edit.scala.html +++ b/src/main/twirl/gitbucket/gist/edit.scala.html @@ -3,7 +3,7 @@ @import gitbucket.gist.model.Mode @import gitbucket.core.view.helpers @gitbucket.core.html.main("Snippets"){ - +
    @@ -22,13 +22,6 @@

    New snippet

    Private }
    - @* - @if(gist.get.mode == "SECRET"){ - Make public - } else { - Make secret - } - *@ Delete
    diff --git a/src/main/twirl/gitbucket/gist/forks.scala.html b/src/main/twirl/gitbucket/gist/forks.scala.html index 338b079..b4951ee 100644 --- a/src/main/twirl/gitbucket/gist/forks.scala.html +++ b/src/main/twirl/gitbucket/gist/forks.scala.html @@ -5,7 +5,7 @@ editable: Boolean)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers @gitbucket.core.html.main("Snippets"){ - +
    @gitbucket.gist.html.header(gist, forkedCount, editable) diff --git a/src/main/twirl/gitbucket/gist/list.scala.html b/src/main/twirl/gitbucket/gist/list.scala.html index 595a664..c444998 100644 --- a/src/main/twirl/gitbucket/gist/list.scala.html +++ b/src/main/twirl/gitbucket/gist/list.scala.html @@ -5,7 +5,7 @@ @import gitbucket.gist.model.Mode @import gitbucket.core.view.helpers @gitbucket.core.html.main(gistUser.map(user => s"${user.userName}'s Snippets").getOrElse("Snippets")){ - +
    diff --git a/src/main/twirl/gitbucket/gist/revisions.scala.html b/src/main/twirl/gitbucket/gist/revisions.scala.html index f816193..433765f 100644 --- a/src/main/twirl/gitbucket/gist/revisions.scala.html +++ b/src/main/twirl/gitbucket/gist/revisions.scala.html @@ -6,7 +6,7 @@ @import gitbucket.core.view.helpers @import org.eclipse.jgit.diff.DiffEntry.ChangeType @gitbucket.core.html.main(s"Revisions · ${gist.repositoryName}"){ - +
    @gitbucket.gist.html.header(gist, forkedCount, editable) From f1ca711d6086d008e091314d215b63fb6a7fa077 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 29 Apr 2018 10:46:31 +0900 Subject: [PATCH 060/179] Fix avatar image location --- src/main/twirl/gitbucket/gist/commentlist.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/gitbucket/gist/commentlist.scala.html b/src/main/twirl/gitbucket/gist/commentlist.scala.html index dcf7307..38966eb 100644 --- a/src/main/twirl/gitbucket/gist/commentlist.scala.html +++ b/src/main/twirl/gitbucket/gist/commentlist.scala.html @@ -4,9 +4,9 @@ repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers @comments.map { comment => -
    @helpers.avatar(comment.commentedUserName, 48)
    + @helpers.avatar(comment.commentedUserName, 20) @helpers.user(comment.commentedUserName, styleClass="username strong") commented From cf28b38a5b5fcdd703eb9b2e650f25d716feaec7 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 29 Apr 2018 11:57:57 +0900 Subject: [PATCH 061/179] Makes possible to preview in editing comment --- .../gist/controller/GistController.scala | 3 +-- .../gitbucket/gist/commentedit.scala.html | 22 ++++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/scala/gitbucket/gist/controller/GistController.scala b/src/main/scala/gitbucket/gist/controller/GistController.scala index 5b84a0d..2f48508 100644 --- a/src/main/scala/gitbucket/gist/controller/GistController.scala +++ b/src/main/scala/gitbucket/gist/controller/GistController.scala @@ -394,8 +394,7 @@ trait GistControllerBase extends ControllerBase { getGist(userName, repoName).flatMap { gist => getGistComment(userName, repoName, commentId).map { comment => params.get("dataType") collect { - case t if t == "html" => gitbucket.gist.html.commentedit( - comment.content, comment.commentId, comment.userName, comment.repositoryName) + case t if t == "html" => gitbucket.gist.html.commentedit(gist, comment.content, comment.commentId) } getOrElse { contentType = formats("json") org.json4s.jackson.Serialization.write( diff --git a/src/main/twirl/gitbucket/gist/commentedit.scala.html b/src/main/twirl/gitbucket/gist/commentedit.scala.html index 5b816fe..6a6da7a 100644 --- a/src/main/twirl/gitbucket/gist/commentedit.scala.html +++ b/src/main/twirl/gitbucket/gist/commentedit.scala.html @@ -1,9 +1,15 @@ -@(content: String, commentId: Int, userName: String, repoName: String)(implicit context: gitbucket.core.controller.Context) +@(gist: gitbucket.gist.model.Gist, content: String, commentId: Int)(implicit context: gitbucket.core.controller.Context) - -
    - - +@gitbucket.gist.html.commentpreview( + gist = gist, + content = content, + style = "height: 100px; max-height: 150px;", + elastic = true, + uid = commentId +) +
    + +
    From 3508a1f2483d412091de697b38532c2ab0e5f3f9 Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Tue, 5 Jul 2022 16:23:15 +0900 Subject: [PATCH 100/179] Create dependabot.yml --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..5ace460 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From 68da1912b4b8af2ef613b43160f80306134e1201 Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Tue, 5 Jul 2022 16:25:32 +0900 Subject: [PATCH 101/179] Create CODEOWNERS --- .github/CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..d6379e6 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,5 @@ +* @takezoe + +build.sbt @xuwei-k +project/* @xuwei-k +.github/* @xuwei-k From d237fb54f0d59dae6b47185a244c607739f797e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 07:23:38 +0000 Subject: [PATCH 102/179] Bump actions/upload-artifact from 2 to 3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 017cdb8..12ce81a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: - name: Assembly run: sbt assembly - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: gitbucket-gist-plugin-java${{ matrix.java }}-${{ github.sha }} path: ./target/scala-2.13/*.jar From ff603279fe4a814dce7b0c807606a47d2182a407 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 07:23:48 +0000 Subject: [PATCH 103/179] Bump actions/cache from 2 to 3 Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12ce81a..cb999d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: cache-sbt-libs with: From d9c1b074483bb354d4bfb9a0569908215bb9fbfa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 07:23:44 +0000 Subject: [PATCH 104/179] Bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb999d2..7677061 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: matrix: java: [8, 11] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache uses: actions/cache@v3 env: From a39f221548a68f482f45ee660360155006ff3cbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 07:32:53 +0000 Subject: [PATCH 105/179] Bump actions/setup-java from 1 to 3 (#70) * Bump actions/setup-java from 1 to 3 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 1 to 3. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v1...v3) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Update build.yml Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kenji yoshida <6b656e6a69@gmail.com> --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7677061..8f91338 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,9 @@ jobs: ~/.coursier key: build-${{ env.cache-name }}-${{ hashFiles('build.sbt') }} - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: temurin java-version: ${{ matrix.java }} - name: Run tests run: | From ac9104d3bd34c8730cf3172c86e1e5215e9d1586 Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Tue, 5 Jul 2022 16:41:02 +0900 Subject: [PATCH 106/179] Update CODEOWNERS --- .github/CODEOWNERS | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d6379e6..b7d5dc9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1 @@ -* @takezoe - -build.sbt @xuwei-k -project/* @xuwei-k -.github/* @xuwei-k +* @takezoe @xuwei-k From 407d23668a43681ea6f74d0aea403df93eb81967 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Tue, 5 Jul 2022 07:43:52 +0000 Subject: [PATCH 107/179] Update scala-library to 2.13.8 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 072cec3..535b302 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" -scalaVersion := "2.13.7" +scalaVersion := "2.13.8" gitbucketVersion := "4.37.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") From a9186d58970c4b9802e6f7227df4ecee557f499f Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Tue, 5 Jul 2022 07:43:56 +0000 Subject: [PATCH 108/179] Update sbt to 1.5.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index da9d652..f4f743c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.6 +sbt.version = 1.5.8 From 00109a8ca6d9b491e695e61d6d61075cd39447f7 Mon Sep 17 00:00:00 2001 From: scala-steward-bot <2517319+scala-steward-bot@users.noreply.github.com> Date: Tue, 5 Jul 2022 17:53:26 +0900 Subject: [PATCH 109/179] Update gitbucket to 4.37.2 (#73) * Update gitbucket to 4.37.2 * Revert commit(s) 021f7d1 * Update gitbucket to 4.37.2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 535b302..b3decfb 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" scalaVersion := "2.13.8" -gitbucketVersion := "4.37.0" +gitbucketVersion := "4.37.2" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "8", "-source", "8") From 4eb6aa40aea69d29b3b099e36e997da0c6ac664a Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Tue, 5 Jul 2022 08:49:30 +0000 Subject: [PATCH 110/179] Update sbt to 1.6.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index f4f743c..f6acff8 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.8 +sbt.version = 1.6.2 From 2a27bd919d298b101a77177e001248fd8f528ac5 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 10 Jul 2022 19:43:20 +0000 Subject: [PATCH 111/179] Update sbt to 1.7.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index f6acff8..85ad641 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.6.2 +sbt.version = 1.7.0 From 278fb810f5a4923c427e9d43fc63ff254007cc83 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Tue, 12 Jul 2022 04:46:36 +0000 Subject: [PATCH 112/179] Update sbt to 1.7.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 85ad641..d738b85 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.7.0 +sbt.version = 1.7.1 From 4afc2681b7ef70474bf62adbcb850ae0fb469aa3 Mon Sep 17 00:00:00 2001 From: scala-steward-bot <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 4 Sep 2022 01:11:01 +0900 Subject: [PATCH 113/179] Update gitbucket to 4.38.0 (#79) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b3decfb..682aa5f 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" scalaVersion := "2.13.8" -gitbucketVersion := "4.37.2" +gitbucketVersion := "4.38.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "8", "-source", "8") From 8c56228093fad9c09b706d326c4cd11ae16ea8b7 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Fri, 9 Sep 2022 17:53:14 +0000 Subject: [PATCH 114/179] Update gitbucket to 4.38.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 682aa5f..f5e1744 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" scalaVersion := "2.13.8" -gitbucketVersion := "4.38.0" +gitbucketVersion := "4.38.1" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "8", "-source", "8") From 7c17bdca29e682fabf459dbb113077aad1e36b2c Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Tue, 20 Sep 2022 08:43:24 +0900 Subject: [PATCH 115/179] add timeout-minutes --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f91338..7ecd23f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,7 @@ on: [push, pull_request] jobs: build: runs-on: ubuntu-latest + timeout-minutes: 20 strategy: matrix: java: [8, 11] From 08ee4b2cea0d05f5aeddd405bd1bd405c2a93bcb Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 19 Sep 2022 19:47:21 +0000 Subject: [PATCH 116/179] Update scala-library to 2.13.9 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f5e1744..5781ca4 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" -scalaVersion := "2.13.8" +scalaVersion := "2.13.9" gitbucketVersion := "4.38.1" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") From e032d18d8730ebca5c7b2f450906d9460b7ddf2b Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Tue, 20 Sep 2022 09:54:26 +0000 Subject: [PATCH 117/179] Update gitbucket to 4.38.2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5781ca4..489f589 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" scalaVersion := "2.13.9" -gitbucketVersion := "4.38.1" +gitbucketVersion := "4.38.2" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "8", "-source", "8") From a81d7ffaad19b21a71feb2c144275c5d32cce943 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 3 Oct 2022 04:34:17 +0000 Subject: [PATCH 118/179] Update sbt to 1.7.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index d738b85..1cfbe55 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.7.1 +sbt.version = 1.7.2 From 3bcd622112a15c6656d59e9fc2b2a6caaca142a6 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sat, 8 Oct 2022 18:57:57 +0000 Subject: [PATCH 119/179] Update scala-library to 2.13.10 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 489f589..ae1ac13 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" -scalaVersion := "2.13.9" +scalaVersion := "2.13.10" gitbucketVersion := "4.38.2" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") From 4d28c90faefeb9ab483efcb0c671e40010aea5d3 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 30 Oct 2022 03:08:18 +0000 Subject: [PATCH 120/179] Update gitbucket to 4.38.3 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ae1ac13..94d17b9 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" scalaVersion := "2.13.10" -gitbucketVersion := "4.38.2" +gitbucketVersion := "4.38.3" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "8", "-source", "8") From e57093ce24d452c87cc8c8271c0f4f2c9eb1c03c Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Wed, 2 Nov 2022 04:49:04 +0000 Subject: [PATCH 121/179] Update gitbucket to 4.38.4 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 94d17b9..f9eb27c 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" scalaVersion := "2.13.10" -gitbucketVersion := "4.38.3" +gitbucketVersion := "4.38.4" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "8", "-source", "8") From 0c5c9501e60e758f1ddd15d640b63a123e7d97dc Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Fri, 28 Apr 2023 17:41:32 +0000 Subject: [PATCH 122/179] Update gitbucket to 4.39.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f9eb27c..62ac8ab 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" scalaVersion := "2.13.10" -gitbucketVersion := "4.38.4" +gitbucketVersion := "4.39.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "8", "-source", "8") From c1d3d844cd0b78332254eef9cb1079c7ae709093 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 1 May 2023 01:33:16 +0900 Subject: [PATCH 123/179] Fix visible Gists pagination (#90) --- .github/workflows/build.yml | 2 +- .gitignore | 1 + build.sbt | 2 +- .../gist/controller/GistController.scala | 2 +- .../gitbucket/gist/service/GistService.scala | 33 +++++++++---------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ecd23f..886e080 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: timeout-minutes: 20 strategy: matrix: - java: [8, 11] + java: [11] steps: - uses: actions/checkout@v3 - name: Cache diff --git a/.gitignore b/.gitignore index c92eacb..ae82060 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ lib_managed/ src_managed/ project/boot/ project/plugins/project/ +.bsp/ # Scala-IDE specific .scala_dependencies diff --git a/build.sbt b/build.sbt index 62ac8ab..4498917 100644 --- a/build.sbt +++ b/build.sbt @@ -5,6 +5,6 @@ scalaVersion := "2.13.10" gitbucketVersion := "4.39.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") -Compile / javacOptions ++= Seq("-target", "8", "-source", "8") +Compile / javacOptions ++= Seq("-target", "11", "-source", "11") useJCenter := true diff --git a/src/main/scala/gitbucket/gist/controller/GistController.scala b/src/main/scala/gitbucket/gist/controller/GistController.scala index 8988d32..10b2112 100644 --- a/src/main/scala/gitbucket/gist/controller/GistController.scala +++ b/src/main/scala/gitbucket/gist/controller/GistController.scala @@ -50,7 +50,7 @@ trait GistControllerBase extends ControllerBase { case s => s.toInt } val result = getVisibleGists((page - 1) * Limit, Limit, context.loginAccount) - val count = countPublicGists() + val count = countVisibleGists(context.loginAccount) val gists: Seq[(Gist, GistInfo)] = result.map { gist => val userName = gist.userName diff --git a/src/main/scala/gitbucket/gist/service/GistService.scala b/src/main/scala/gitbucket/gist/service/GistService.scala index e7e0b0b..5ef7229 100644 --- a/src/main/scala/gitbucket/gist/service/GistService.scala +++ b/src/main/scala/gitbucket/gist/service/GistService.scala @@ -9,35 +9,34 @@ import gitbucket.gist.model.Profile.dateColumnType trait GistService { - def getRecentGists(userName: String, offset: Int, limit: Int)(implicit s: Session): Seq[Gist] = - Gists.filter(_.userName === userName.bind).sortBy(_.registeredDate desc).drop(offset).take(limit).list + def getVisibleGists(offset: Int, limit: Int, account: Option[Account])(implicit s: Session): Seq[Gist] = + visibleHistsQuery(account).sortBy(_.registeredDate desc).drop(offset).take(limit).list - def getVisibleGists(offset: Int, limit: Int, account: Option[Account])(implicit s: Session): Seq[Gist] = { - val query = account.map { x => + def countVisibleGists(account: Option[Account])(implicit s: Session): Int = + Query(visibleHistsQuery(account).length).first + + private def visibleHistsQuery(account: Option[Account]): Query[Gists, Gists#TableElementType, Seq] = { + account.map { x => Gists.filter { t => (t.mode === "PUBLIC".bind) || (t.userName === x.userName.bind) } } getOrElse { Gists.filter { t => (t.mode === "PUBLIC".bind) } } - query.sortBy(_.registeredDate desc).drop(offset).take(limit).list } - def countPublicGists()(implicit s: Session): Int = - Query(Gists.filter(_.mode === "PUBLIC".bind).length).first - def getUserGists(userName: String, loginUserName: Option[String], offset: Int, limit: Int)(implicit s: Session): Seq[Gist] = - (if(loginUserName.isDefined){ - Gists filter(t => (t.userName === userName.bind) && ((t.userName === loginUserName.bind) || (t.mode === "PUBLIC".bind))) - } else { - Gists filter(t => (t.userName === userName.bind) && (t.mode === "PUBLIC".bind)) - }).sortBy(_.registeredDate desc).drop(offset).take(limit).list + userGistsQuery(userName, loginUserName).sortBy(_.registeredDate desc).drop(offset).take(limit).list def countUserGists(userName: String, loginUserName: Option[String])(implicit s: Session): Int = - Query((if(loginUserName.isDefined){ - Gists.filter(t => (t.userName === userName.bind) && ((t.userName === loginUserName.bind) || (t.mode === "PUBLIC".bind))) + Query(userGistsQuery(userName, loginUserName).length).first + + private def userGistsQuery(userName: String, loginUserName: Option[String]): Query[Gists, Gists#TableElementType, Seq] = { + if (loginUserName.isDefined) { + Gists filter (t => (t.userName === userName.bind) && ((t.userName === loginUserName.bind) || (t.mode === "PUBLIC".bind))) } else { - Gists.filter(t => (t.userName === userName.bind) && (t.mode === "PUBLIC".bind)) - }).length).first + Gists filter (t => (t.userName === userName.bind) && (t.mode === "PUBLIC".bind)) + } + } def getGist(userName: String, repositoryName: String)(implicit s: Session): Option[Gist] = Gists.filter(t => (t.userName === userName.bind) && (t.repositoryName === repositoryName.bind)).firstOption From 2a2e742621eed97559d79850e14315501292e4df Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 1 May 2023 02:48:57 +0900 Subject: [PATCH 124/179] Upgrade to sbt 1.8.2 and sbt-gitbucket-plugin 1.6.0 (#92) --- project/build.properties | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/build.properties b/project/build.properties index 1cfbe55..f344c14 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.7.2 +sbt.version = 1.8.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 6249dcc..3fcddcc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.5.1") \ No newline at end of file +addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.6.0") \ No newline at end of file From 0c7d93d3b8da94a7395b9a85b07c2a422231f017 Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 1 May 2023 02:52:17 +0900 Subject: [PATCH 125/179] Fix Markdown table in README --- README.md | 57 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 7575c1f..5521fd3 100644 --- a/README.md +++ b/README.md @@ -2,35 +2,34 @@ This is a GitBucket plug-in which provides code snippet repository like Gist. -Plugin version | GitBucket version -:--------------|:-------------------- -4.22.x | 4.37.x - -4.21.x | 4.36.x - -4.20.x | 4.35.x - -4.19.x | 4.34.x - -4.18.x | 4.32.x - 4.33.x -4.17.x | 4.30.x - 4.31.x -4.16.x | 4.26.x - 4.29.x -4.15.x | 4.25.x -4.13.x, 4.14.x | 4.23.x - 4.24.x -4.12.x | 4.21.x - 4.22.x -4.11.x | 4.19.x - 4.20.x -4.10.x | 4.15.x - 4.18.x -4.9.x | 4.14.x -4.8.x | 4.11.x - 4.13.x -4.7.x | 4.11.x -4.6.x | 4.10.x -4.5.x | 4.9.x -4.4.x | 4.8.x -4.2.x, 4.3.x | 4.2.x - 4.7.x -4.0.x | 4.0.x - 4.1.x -3.13.x | 3.13.x -3.12.x | 3.12.x -3.11.x | 3.11.x -3.10.x | 3.10.x -3.7.x | 3.7.x - 3.9.x -3.6.x | 3.6.x - +| Plugin version | GitBucket version | +|:---------------|:------------------| +| 4.22.x | 4.37.x - | +| 4.21.x | 4.36.x - | +| 4.20.x | 4.35.x - | +| 4.19.x | 4.34.x - | +| 4.18.x | 4.32.x - 4.33.x | +| 4.17.x | 4.30.x - 4.31.x | +| 4.16.x | 4.26.x - 4.29.x | +| 4.15.x | 4.25.x | +| 4.13.x, 4.14.x | 4.23.x - 4.24.x | +| 4.12.x | 4.21.x - 4.22.x | +| 4.11.x | 4.19.x - 4.20.x | +| 4.10.x | 4.15.x - 4.18.x | +| 4.9.x | 4.14.x | +| 4.8.x | 4.11.x - 4.13.x | +| 4.7.x | 4.11.x | +| 4.6.x | 4.10.x | +| 4.5.x | 4.9.x | +| 4.4.x | 4.8.x | +| 4.2.x, 4.3.x | 4.2.x - 4.7.x | +| 4.0.x | 4.0.x - 4.1.x | +| 3.13.x | 3.13.x | +| 3.12.x | 3.12.x | +| 3.11.x | 3.11.x | +| 3.10.x | 3.10.x | +| 3.7.x | 3.7.x - 3.9.x | +| 3.6.x | 3.6.x | ## Installation From cf3eec779ef8e7e10f0fa5ec46e726ccce0d3553 Mon Sep 17 00:00:00 2001 From: scala-steward-bot <2517319+scala-steward-bot@users.noreply.github.com> Date: Fri, 12 May 2023 21:19:24 +0900 Subject: [PATCH 126/179] Update sbt to 1.8.3 (#93) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index f344c14..ef3d266 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.8.2 +sbt.version = 1.8.3 From 01ac5b7be5be019a84dcc373969cc7f7394629cc Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Fri, 2 Jun 2023 09:41:39 +0000 Subject: [PATCH 127/179] Update sbt to 1.9.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index ef3d266..8fd7d2e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.8.3 +sbt.version = 1.9.0 From ed8270c122305d2c098db8d3f69937a03b078097 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Fri, 2 Jun 2023 15:41:46 +0000 Subject: [PATCH 128/179] Update scala-library to 2.13.11 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4498917..34e8a51 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" -scalaVersion := "2.13.10" +scalaVersion := "2.13.11" gitbucketVersion := "4.39.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") From 598166c5206e26b09f21e850e5746318cb53f764 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 26 Jun 2023 04:46:15 +0000 Subject: [PATCH 129/179] Update sbt to 1.9.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 8fd7d2e..62499c3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.0 +sbt.version = 1.9.1 From d2cfbe64bdff97fba1088397a03ba664c2c9a8d3 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 10 Jul 2023 02:21:59 +0000 Subject: [PATCH 130/179] Update sbt to 1.9.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 62499c3..58c9814 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.1 +sbt.version = 1.9.2 From 24437d0419c2a9b00c34634b777e838b03c2a09d Mon Sep 17 00:00:00 2001 From: scala-steward-bot <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 24 Jul 2023 22:51:14 +0900 Subject: [PATCH 131/179] Update sbt to 1.9.3 (#98) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 58c9814..e3c114d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.2 +sbt.version = 1.9.3 From d069fa8679a7b229a9d1fc557f66bf40b59523a9 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Thu, 24 Aug 2023 21:41:15 +0000 Subject: [PATCH 132/179] Update sbt to 1.9.4 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e3c114d..06969a3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.3 +sbt.version = 1.9.4 From 3ccec10c7c8f79f85fbec0c0dff4103b46abedc4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 15:46:48 +0000 Subject: [PATCH 133/179] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 886e080..590faee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: matrix: java: [11] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Cache uses: actions/cache@v3 env: From f556ace3ec33b39e3513b09dd0451ccb6e3c554a Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Wed, 6 Sep 2023 18:41:31 +0000 Subject: [PATCH 134/179] Update scala-library to 2.13.12 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 34e8a51..4a57036 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" gitbucketVersion := "4.39.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") From 3d424a799754613fe8e2c0d44d6460c6ec5d3b50 Mon Sep 17 00:00:00 2001 From: scala-steward-bot <2517319+scala-steward-bot@users.noreply.github.com> Date: Fri, 15 Sep 2023 00:27:03 +0900 Subject: [PATCH 135/179] Update sbt to 1.9.5 (#102) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 06969a3..93b393f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.4 +sbt.version = 1.9.5 From 6536d2c4185bd5cdcdbeb6b5ef694b6ae83e5618 Mon Sep 17 00:00:00 2001 From: scala-steward-bot <2517319+scala-steward-bot@users.noreply.github.com> Date: Sat, 16 Sep 2023 07:25:11 +0900 Subject: [PATCH 136/179] Update sbt to 1.9.6 (#103) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 93b393f..303541e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.5 +sbt.version = 1.9.6 From 478636d8c321f5b826fd991fedf7942fd1f06968 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 22 Oct 2023 17:46:00 +0900 Subject: [PATCH 137/179] Support GitBucket 4.40.0 (#105) --- build.sbt | 2 +- src/main/scala/gitbucket/gist/controller/GistController.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 4a57036..5b84d80 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.22.0" scalaVersion := "2.13.12" -gitbucketVersion := "4.39.0" +gitbucketVersion := "4.40.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "11", "-source", "11") diff --git a/src/main/scala/gitbucket/gist/controller/GistController.scala b/src/main/scala/gitbucket/gist/controller/GistController.scala index 10b2112..988ef1c 100644 --- a/src/main/scala/gitbucket/gist/controller/GistController.scala +++ b/src/main/scala/gitbucket/gist/controller/GistController.scala @@ -114,7 +114,7 @@ trait GistControllerBase extends ControllerBase { val repoName = StringUtil.md5(userName + " " + datetime(new java.util.Date())) val gitdir = new File(GistRepoDir, userName + "/" + repoName) gitdir.mkdirs() - JGitUtil.initRepository(gitdir) + JGitUtil.initRepository(gitdir, "master") // Insert record registerGist( From 38e7477af841d333a17924d6e6313b9bb0243169 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 22 Oct 2023 17:47:54 +0900 Subject: [PATCH 138/179] Release 4.23.0 --- README.md | 1 + build.sbt | 2 +- src/main/scala/Plugin.scala | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5521fd3..2f9d5fa 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ This is a GitBucket plug-in which provides code snippet repository like Gist. | Plugin version | GitBucket version | |:---------------|:------------------| +| 4.23.x | 4.40.x - | | 4.22.x | 4.37.x - | | 4.21.x | 4.36.x - | | 4.20.x | 4.35.x - | diff --git a/build.sbt b/build.sbt index 5b84d80..de8a6f7 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" -version := "4.22.0" +version := "4.23.0" scalaVersion := "2.13.12" gitbucketVersion := "4.40.0" diff --git a/src/main/scala/Plugin.scala b/src/main/scala/Plugin.scala index c35345a..830e64c 100755 --- a/src/main/scala/Plugin.scala +++ b/src/main/scala/Plugin.scala @@ -44,7 +44,8 @@ class Plugin extends gitbucket.core.plugin.Plugin { new Version("4.19.0"), new Version("4.20.0"), new Version("4.21.0"), - new Version("4.22.0") + new Version("4.22.0"), + new Version("4.23.0") ) override def initialize(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = { From caac95eda57441f10ffa494bdaa0f468114a5ada Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:40:05 +0000 Subject: [PATCH 139/179] Update sbt to 1.9.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 303541e..b19d4e1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.6 +sbt.version = 1.9.7 From 1be1ab339fd07850a6bc4e22af1fbe9c672daf96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:08:08 +0000 Subject: [PATCH 140/179] Bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 590faee..bbffed2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: ~/.coursier key: build-${{ env.cache-name }}-${{ hashFiles('build.sbt') }} - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{ matrix.java }} From cd41e8d39612c66317aeeb5807a0447e67f0f220 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:39:20 +0000 Subject: [PATCH 141/179] Update sbt to 1.9.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index b19d4e1..0aa5c39 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.7 +sbt.version = 1.9.8 From 81605e1c6493774d96e1acd613b82baab976aa82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 15:05:25 +0000 Subject: [PATCH 142/179] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bbffed2..03c3a38 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - name: Assembly run: sbt assembly - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: gitbucket-gist-plugin-java${{ matrix.java }}-${{ github.sha }} path: ./target/scala-2.13/*.jar From c0d201e399b81bfc4dbcbbe913000103d19105e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:20:55 +0000 Subject: [PATCH 143/179] Bump actions/cache from 3 to 4 Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03c3a38..1d016f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Cache - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-sbt-libs with: From 65097c44ea9557c8257bbe0750a1335b59f9bb80 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Wed, 21 Feb 2024 22:38:38 +0000 Subject: [PATCH 144/179] Update scala-library to 2.13.13 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index de8a6f7..2da52d8 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" -scalaVersion := "2.13.12" +scalaVersion := "2.13.13" gitbucketVersion := "4.40.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") From 23c881e80a40ce4a8dd293d28405bad3b8bf5ef9 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Fri, 23 Feb 2024 06:37:39 +0000 Subject: [PATCH 145/179] Update sbt to 1.9.9 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 0aa5c39..49214c4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.8 +sbt.version = 1.9.9 From d09ee757c4dc5c3c2db51edfbc65d0ca0839761d Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 29 Apr 2024 22:36:44 +0000 Subject: [PATCH 146/179] Update scala-library to 2.13.14 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 2da52d8..9577658 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" -scalaVersion := "2.13.13" +scalaVersion := "2.13.14" gitbucketVersion := "4.40.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") From b92f3fdd6d94346fbdcdeecc08a325506f3eeade Mon Sep 17 00:00:00 2001 From: scala-steward-bot <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 6 May 2024 13:19:39 +0900 Subject: [PATCH 147/179] Update sbt to 1.10.0 (#114) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 49214c4..be54e77 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.9.9 +sbt.version = 1.10.0 From 7cb7c92f9577ba04cdac3287db45f43b2b5c66ef Mon Sep 17 00:00:00 2001 From: scala-steward-bot <2517319+scala-steward-bot@users.noreply.github.com> Date: Sat, 18 May 2024 16:13:58 +0900 Subject: [PATCH 148/179] Update gitbucket to 4.41.0 (#115) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9577658..9625a93 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" scalaVersion := "2.13.14" -gitbucketVersion := "4.40.0" +gitbucketVersion := "4.41.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "11", "-source", "11") From 83f77cf22769a8bab8e4c32cb01941c946a531db Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 7 Jul 2024 22:36:59 +0000 Subject: [PATCH 149/179] Update sbt to 1.10.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index be54e77..136f452 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.0 +sbt.version = 1.10.1 From 75c5a0f6525689b005567b24814fb67edc7d133a Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 16 Sep 2024 02:01:59 +0000 Subject: [PATCH 150/179] Update sbt to 1.10.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 136f452..23f7d97 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.1 +sbt.version = 1.10.2 From 22655a65ef99ba0ec66ced41a19f0dafbc17a208 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Fri, 20 Sep 2024 20:39:35 +0000 Subject: [PATCH 151/179] Update scala-library to 2.13.15 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9625a93..3974804 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" gitbucketVersion := "4.41.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") From 98ccb89974883edbe13f23ced8020e7f291d8b08 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 20 Oct 2024 01:01:57 +0000 Subject: [PATCH 152/179] Update sbt, scripted-plugin to 1.10.3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 23f7d97..cbf878e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.2 +sbt.version = 1.10.3 From 1fe8b7680fecc4f0bce9a496012296002f41fd1c Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 28 Oct 2024 10:45:18 +0000 Subject: [PATCH 153/179] Update sbt, scripted-plugin to 1.10.4 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index cbf878e..04a3949 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.3 +sbt.version = 1.10.4 From 74ce2424de8603d70e222d292d043e574d1cbf18 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 3 Nov 2024 22:41:23 +0000 Subject: [PATCH 154/179] Update sbt, scripted-plugin to 1.10.5 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 04a3949..1767a6f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.4 +sbt.version = 1.10.5 From 6611e9702b4f0634b37f469125091a0e2a8c2945 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sat, 30 Nov 2024 06:46:14 +0000 Subject: [PATCH 155/179] Update sbt, scripted-plugin to 1.10.6 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 1767a6f..7a159c4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.5 +sbt.version = 1.10.6 From 3ec8aa1a7fdb8a4466b95e2e9ea0688f0addae88 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 23 Dec 2024 02:03:18 +0000 Subject: [PATCH 156/179] Update sbt, scripted-plugin to 1.10.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 7a159c4..fe69360 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.6 +sbt.version = 1.10.7 From 084862758a1603e23395ae94d46c0c97a19cd84b Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 29 Dec 2024 20:36:57 +0000 Subject: [PATCH 157/179] Update gitbucket to 4.42.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3974804..1136140 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" scalaVersion := "2.13.15" -gitbucketVersion := "4.41.0" +gitbucketVersion := "4.42.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "11", "-source", "11") From 896042d473420fb6b0beb2ac90eb804610bdd9a7 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:40:15 +0000 Subject: [PATCH 158/179] Update scala-library to 2.13.16 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1136140..10026f7 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" gitbucketVersion := "4.42.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") From e91f0c9ff512d3dc67923dd713c3539a7b3e7e01 Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Tue, 21 Jan 2025 08:47:13 +0900 Subject: [PATCH 159/179] setup-sbt --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d016f6..6f3461c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,7 @@ jobs: with: distribution: temurin java-version: ${{ matrix.java }} + - uses: sbt/setup-sbt@v1 - name: Run tests run: | git clone https://github.com/gitbucket/gitbucket.git From ec1f8153f00dd8f1dc813d2a2bbff94433cad7d7 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 20 Jan 2025 16:44:01 +0000 Subject: [PATCH 160/179] Update gitbucket to 4.42.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 10026f7..75bc7be 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" scalaVersion := "2.13.16" -gitbucketVersion := "4.42.0" +gitbucketVersion := "4.42.1" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "11", "-source", "11") From 5bd3499802a4e546d92f241778e2dffcf4a502b0 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 3 Mar 2025 08:44:52 +0000 Subject: [PATCH 161/179] Update sbt, scripted-plugin to 1.10.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index fe69360..3ad322e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.7 +sbt.version = 1.10.8 From 412516504372966119a75632e6e77cb6e3d24726 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 3 Mar 2025 18:46:01 +0000 Subject: [PATCH 162/179] Update sbt, scripted-plugin to 1.10.9 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 3ad322e..a225ae6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.8 +sbt.version = 1.10.9 From f9baa5c68182f631075de6c93c4daffc8f727517 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Tue, 4 Mar 2025 06:47:06 +0000 Subject: [PATCH 163/179] Update sbt, scripted-plugin to 1.10.10 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index a225ae6..7f28078 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.9 +sbt.version = 1.10.10 From aeb51f740df9562b0fc1e20a539065b0050f9631 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 17 Mar 2025 06:48:15 +0000 Subject: [PATCH 164/179] Update sbt, scripted-plugin to 1.10.11 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 7f28078..53bb739 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.10 +sbt.version = 1.10.11 From 7611ca3c6bfb652fbd16b8b85c1c04cc45b4edcf Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sat, 24 May 2025 06:47:25 +0000 Subject: [PATCH 165/179] Update sbt, scripted-plugin to 1.11.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 53bb739..360c594 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.11 +sbt.version = 1.11.0 From fbee5d370a1bfa9d452f69c30a73b8423d1def11 Mon Sep 17 00:00:00 2001 From: scala-steward-bot <2517319+scala-steward-bot@users.noreply.github.com> Date: Thu, 5 Jun 2025 21:12:14 +0900 Subject: [PATCH 166/179] Update sbt, scripted-plugin to 1.11.1 (#132) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 360c594..3093542 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.11.0 +sbt.version = 1.11.1 From e3a39f26535f580e9960b8ff3acca646a1f2c298 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sat, 7 Jun 2025 20:42:07 +0000 Subject: [PATCH 167/179] Update sbt, scripted-plugin to 1.11.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 3093542..7ff4b8b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.11.1 +sbt.version = 1.11.2 From 54b4278fbbf4314e63c32407729a5f489835a65a Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 29 Jun 2025 04:58:41 +0000 Subject: [PATCH 168/179] Update gitbucket to 4.43.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 75bc7be..85e84fa 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" scalaVersion := "2.13.16" -gitbucketVersion := "4.42.1" +gitbucketVersion := "4.43.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "11", "-source", "11") From 94db269e0cc21f71b38ca1ba6705b19767002960 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sat, 5 Jul 2025 20:42:46 +0000 Subject: [PATCH 169/179] Update sbt, scripted-plugin to 1.11.3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 7ff4b8b..1b248df 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.11.2 +sbt.version = 1.11.3 From 9fbd5eb017b39358e01f3581e6170b4e1008b85e Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 4 Aug 2025 10:53:15 +0000 Subject: [PATCH 170/179] Update sbt, scripted-plugin to 1.11.4 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 1b248df..f7bc74d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.11.3 +sbt.version = 1.11.4 From 794faff1fca93a352132a268ceda93ead3b711fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 21:00:36 +0000 Subject: [PATCH 171/179] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f3461c..d13fa33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: matrix: java: [11] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Cache uses: actions/cache@v4 env: From ad3a9340de0dd79aaffa481783744a50437b1169 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 24 Aug 2025 20:42:09 +0000 Subject: [PATCH 172/179] Update sbt, scripted-plugin to 1.11.5 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index f7bc74d..984ed71 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.11.4 +sbt.version = 1.11.5 From 0dd178207116431a375f6e7570fb969120561ccd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Aug 2025 05:51:16 +0000 Subject: [PATCH 173/179] Bump actions/setup-java from 4 to 5 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4 to 5. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d13fa33..d9a3f33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: ~/.coursier key: build-${{ env.cache-name }}-${{ hashFiles('build.sbt') }} - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: ${{ matrix.java }} From 60e97f0a93825c1ec28e8b97aaeb7deea8e70513 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sat, 6 Sep 2025 22:40:25 +0000 Subject: [PATCH 174/179] Update sbt, scripted-plugin to 1.11.6 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 984ed71..f0fdcab 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.11.5 +sbt.version = 1.11.6 From 2373a589092ce695ae3b835157c2f73c9a8d4c11 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Tue, 23 Sep 2025 02:11:06 +0000 Subject: [PATCH 175/179] Update gitbucket to 4.44.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 85e84fa..e45d196 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" scalaVersion := "2.13.16" -gitbucketVersion := "4.43.0" +gitbucketVersion := "4.44.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") Compile / javacOptions ++= Seq("-target", "11", "-source", "11") From 33a1b60911368c80647bc848d17a390fb5253560 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Tue, 30 Sep 2025 08:50:55 +0000 Subject: [PATCH 176/179] Update scala-library to 2.13.17 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e45d196..8b8c86c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" -scalaVersion := "2.13.16" +scalaVersion := "2.13.17" gitbucketVersion := "4.44.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps") From 805a30ef5a75c36f08d9f4ebe6fb1b28541907f6 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Sun, 5 Oct 2025 20:39:52 +0000 Subject: [PATCH 177/179] Update sbt, scripted-plugin to 1.11.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index f0fdcab..a360cca 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.11.6 +sbt.version = 1.11.7 From 5f826609d02bd263051a1f55808a98f792a9d65f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 15:26:20 +0000 Subject: [PATCH 178/179] Bump actions/upload-artifact from 4 to 5 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9a3f33..d5bae3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: - name: Assembly run: sbt assembly - name: Upload artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: gitbucket-gist-plugin-java${{ matrix.java }}-${{ github.sha }} path: ./target/scala-2.13/*.jar From 5eca9526900c14b56c45434047a41a61b0c140db Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Mon, 17 Nov 2025 10:48:26 +0000 Subject: [PATCH 179/179] Update scala-library to 2.13.18 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8b8c86c..49c6ffd 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ organization := "io.github.gitbucket" name := "gitbucket-gist-plugin" version := "4.23.0" -scalaVersion := "2.13.17" +scalaVersion := "2.13.18" gitbucketVersion := "4.44.0" scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps")