5 files changed, 12 insertions, 27 deletions
diff --git a/routers/init.go b/routers/init.go
index 8cf53fc108..c539975aca 100644
--- a/routers/init.go
+++ b/routers/init.go
@@ -71,13 +71,6 @@ func mustInitCtx(ctx context.Context, fn func(ctx context.Context) error) {
 	}
 }
 
-// InitGitServices init new services for git, this is also called in `contrib/pr/checkout.go`
-func InitGitServices() {
-	setting.LoadSettings()
-	mustInit(storage.Init)
-	mustInit(repo_service.Init)
-}
-
 func syncAppConfForGit(ctx context.Context) error {
 	runtimeState := new(system.RuntimeState)
 	if err := system.AppState.Get(runtimeState); err != nil {
@@ -172,7 +165,7 @@ func GlobalInitInstalled(ctx context.Context) {
 	mustInit(ssh.Init)
 
 	auth.Init()
-	svg.Init()
+	mustInit(svg.Init)
 
 	actions_service.Init()
 
diff --git a/routers/install/routes.go b/routers/install/routes.go
index 82d9c34b41..df82ba2e4c 100644
--- a/routers/install/routes.go
+++ b/routers/install/routes.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"html"
 	"net/http"
-	"path"
 
 	"code.gitea.io/gitea/modules/httpcache"
 	"code.gitea.io/gitea/modules/log"
@@ -89,10 +88,7 @@ func Routes(ctx goctx.Context) *web.Route {
 		r.Use(middle)
 	}
 
-	r.Use(web.WrapWithPrefix(public.AssetsURLPathPrefix, public.AssetsHandlerFunc(&public.Options{
-		Directory: path.Join(setting.StaticRootPath, "public"),
-		Prefix:    public.AssetsURLPathPrefix,
-	}), "InstallAssetsHandler"))
+	r.Use(web.WrapWithPrefix("/assets/", public.AssetsHandlerFunc("/assets/"), "AssetsHandler"))
 
 	r.Use(session.Sessioner(session.Options{
 		Provider:       setting.SessionConfig.Provider,
diff --git a/routers/install/setting.go b/routers/install/setting.go
index 68984f1e78..dadefa26a2 100644
--- a/routers/install/setting.go
+++ b/routers/install/setting.go
@@ -30,7 +30,7 @@ func PreloadSettings(ctx context.Context) bool {
 		}
 
 		setting.LoadSettingsForInstall()
-		svg.Init()
+		_ = svg.Init()
 	}
 
 	return !setting.InstallLock
@@ -47,6 +47,5 @@ func reloadSettings(ctx context.Context) {
 		} else {
 			log.Fatal("ORM engine initialization failed: %v", err)
 		}
-		svg.Init()
 	}
 }
diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go
index eb77d0b927..784940909a 100644
--- a/routers/web/devtest/devtest.go
+++ b/routers/web/devtest/devtest.go
@@ -15,15 +15,16 @@ import (
 
 // List all devtest templates, they will be used for e2e tests for the UI components
 func List(ctx *context.Context) {
-	templateNames := templates.GetTemplateAssetNames()
+	templateNames, err := templates.AssetFS().ListFiles("devtest", true)
+	if err != nil {
+		ctx.ServerError("AssetFS().ListFiles", err)
+		return
+	}
 	var subNames []string
-	const prefix = "templates/devtest/"
 	for _, tmplName := range templateNames {
-		if strings.HasPrefix(tmplName, prefix) {
-			subName := strings.TrimSuffix(strings.TrimPrefix(tmplName, prefix), ".tmpl")
-			if subName != "list" {
-				subNames = append(subNames, subName)
-			}
+		subName := strings.TrimSuffix(tmplName, ".tmpl")
+		if subName != "list" {
+			subNames = append(subNames, subName)
 		}
 	}
 	ctx.Data["SubNames"] = subNames
diff --git a/routers/web/web.go b/routers/web/web.go
index cee8bafcdb..a4a1b7113c 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -103,11 +103,7 @@ func buildAuthGroup() *auth_service.Group {
 func Routes(ctx gocontext.Context) *web.Route {
 	routes := web.NewRoute()
 
-	routes.Use(web.WrapWithPrefix(public.AssetsURLPathPrefix, public.AssetsHandlerFunc(&public.Options{
-		Directory:   path.Join(setting.StaticRootPath, "public"),
-		Prefix:      public.AssetsURLPathPrefix,
-		CorsHandler: CorsHandler(),
-	}), "AssetsHandler"))
+	routes.Use(web.WrapWithPrefix("/assets/", web.Wrap(CorsHandler(), public.AssetsHandlerFunc("/assets/")), "AssetsHandler"))
 
 	sessioner := session.Sessioner(session.Options{
 		Provider:       setting.SessionConfig.Provider,