Skip to content

Commit c98a052

Browse files
takezoeyaroot
authored andcommitted
Fix according to changing tail slash handling in GitBucket 4.23
1 parent 28119aa commit c98a052

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ resolvers ++= Seq(
1111
)
1212

1313
libraryDependencies ++= Seq(
14-
"io.github.gitbucket" %% "gitbucket" % "4.22.0",
14+
"io.github.gitbucket" %% "gitbucket" % "4.23.0-SNAPSHOT",
1515
"javax.servlet" % "javax.servlet-api" % "3.1.0"
1616
)
1717

src/main/scala/gitbucket/plugin/pages/pages.scala

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package gitbucket.plugin.pages
22

33
import gitbucket.core.controller.ControllerBase
4+
import gitbucket.core.service.RepositoryService.RepositoryInfo
45
import gitbucket.core.service.{ AccountService, RepositoryService }
56
import gitbucket.core.util.Implicits._
67
import gitbucket.core.util.SyntaxSugars._
@@ -36,7 +37,14 @@ trait PagesControllerBase extends ControllerBase {
3637
val PAGES_BRANCHES = List("gb-pages", "gh-pages")
3738

3839
get("/:owner/:repository/pages/*")(referrersOnly { repository =>
39-
val path = params("splat")
40+
renderPage(repository, params("splat"))
41+
})
42+
43+
get("/:owner/:repository/pages")(referrersOnly { repository =>
44+
renderPage(repository, "")
45+
})
46+
47+
private def renderPage(repository: RepositoryInfo, path: String) = {
4048
using(Git.open(Directory.getRepositoryDir(repository.owner, repository.name))) { git =>
4149
getPageSource(repository.owner, repository.name) match {
4250
case PageSourceType.GH_PAGES =>
@@ -49,11 +57,7 @@ trait PagesControllerBase extends ControllerBase {
4957
NotFound()
5058
}
5159
}
52-
})
53-
54-
get("/:owner/:repository/pages")(referrersOnly { repository =>
55-
redirect(s"/${repository.owner}/${repository.name}/pages/")
56-
})
60+
}
5761

5862
get("/:owner/:repository/settings/pages")(ownerOnly { repository =>
5963
val source = getPageSource(repository.owner, repository.name)

0 commit comments

Comments
 (0)