Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-03 12:05:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reformat with scalafmt 3.8.2

Browse Source 
Executed command: scalafmt --non-interactive
This commit is contained in:
Scala Steward
2024-06-14 16:40:55 +00:00
parent 1c818f890a
commit f1360f44c6
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build.sbt
View File

@@ -37,7 +37,10 @@ libraryDependencies ++= Seq(
"org.apache.commons" % "commons-email" % "1.6.0", "org.apache.commons" % "commons-email" % "1.6.0",
"commons-net" % "commons-net" % "3.11.1", "commons-net" % "commons-net" % "3.11.1",
"org.apache.httpcomponents" % "httpclient" % "4.5.14", "org.apache.httpcomponents" % "httpclient" % "4.5.14",
"org.apache.sshd" % "apache-sshd" % "2.12.1" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"), "org.apache.sshd" % "apache-sshd" % "2.12.1" exclude ("org.slf4j", "slf4j-jdk14") exclude (
"org.apache.sshd",
"sshd-mina"
) exclude ("org.apache.sshd", "sshd-netty"),
"org.apache.tika" % "tika-core" % "2.9.2", "org.apache.tika" % "tika-core" % "2.9.2",
"com.github.takezoe" %% "blocking-slick" % "0.0.14", "com.github.takezoe" %% "blocking-slick" % "0.0.14",
"com.novell.ldap" % "jldap" % "2009-10-07", "com.novell.ldap" % "jldap" % "2009-10-07",
@@ -152,8 +155,11 @@ executableKey := {
// include jetty classes // include jetty classes
val jettyJars = Keys.update.value select configurationFilter(name = ExecutableConfig.name) val jettyJars = Keys.update.value select configurationFilter(name = ExecutableConfig.name)
jettyJars foreach { jar => jettyJars foreach { jar =>
IO unzip (jar, temp, (name: String) => IO unzip (
(name startsWith "javax/") || (name startsWith "org/") || (name startsWith "META-INF/services/")) jar,
temp,
(name: String) => (name startsWith "javax/") || (name startsWith "org/") || (name startsWith "META-INF/services/")
)
} }
// include original war file // include original war file

10
src/main/scala/gitbucket/core/util/JGitUtil.scala
View File

@@ -502,9 +502,15 @@ object JGitUtil {
val linkUrl = if (treeWalk.getFileMode(0) == FileMode.GITLINK) { val linkUrl = if (treeWalk.getFileMode(0) == FileMode.GITLINK) {
getSubmodules(git, revCommit.getTree, baseUrl).find(_.path == treeWalk.getPathString).map(_.viewerUrl) getSubmodules(git, revCommit.getTree, baseUrl).find(_.path == treeWalk.getPathString).map(_.viewerUrl)
} else None } else None
fileList +:= (treeWalk.getObjectId(0), treeWalk.getFileMode( fileList +:= (
treeWalk.getObjectId(0),
treeWalk.getFileMode(
0 0
), treeWalk.getNameString, treeWalk.getPathString, linkUrl) ),
treeWalk.getNameString,
treeWalk.getPathString,
linkUrl
)
} }
} }