diff options
| author | a1012112796 <1012112796@qq.com> | 2021-04-28 20:35:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 12:35:06 +0000 |
| commit | 1e877613bf941ae9bed17e5b6c5b118bd3107777 (patch) | |
| tree | e6b34d3244a869dbde02e5194deab29d3d511328 /modules | |
| parent | cc7d118b126cf451b1f3f9df72eb2f2e091d7ebc (diff) | |
| download | gitea-1e877613bf941ae9bed17e5b6c5b118bd3107777.tar.gz gitea-1e877613bf941ae9bed17e5b6c5b118bd3107777.zip | |
add `/assets` as root dir of public files (#15219)
* add `/assets` as root dir of public files
Signed-off-by: a1012112796 <1012112796@qq.com>
* move serviceworker.js
* make fmt
* fix some link
* fix test
* Apply suggestions from code review
Co-authored-by: silverwind <me@silverwind.io>
* Apply suggestions from code review
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/public/public.go | 1 | ||||
| -rw-r--r-- | modules/setting/picture.go | 2 | ||||
| -rw-r--r-- | modules/setting/setting.go | 4 | ||||
| -rw-r--r-- | modules/templates/helper.go | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/modules/public/public.go b/modules/public/public.go index 14525cfa0e..c68f980352 100644 --- a/modules/public/public.go +++ b/modules/public/public.go @@ -32,7 +32,6 @@ var KnownPublicEntries = []string{ "js", "serviceworker.js", "vendor", - "favicon.ico", } // Custom implements the static handler for serving custom assets. diff --git a/modules/setting/picture.go b/modules/setting/picture.go index fa97245aa1..415552d7ce 100644 --- a/modules/setting/picture.go +++ b/modules/setting/picture.go @@ -110,5 +110,5 @@ func newRepoAvatarService() { RepoAvatar.Storage = getStorage("repo-avatars", storageType, repoAvatarSec) RepoAvatar.Fallback = sec.Key("REPOSITORY_AVATAR_FALLBACK").MustString("none") - RepoAvatar.FallbackImage = sec.Key("REPOSITORY_AVATAR_FALLBACK_IMAGE").MustString("/img/repo_default.png") + RepoAvatar.FallbackImage = sec.Key("REPOSITORY_AVATAR_FALLBACK_IMAGE").MustString("/assets/img/repo_default.png") } diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 7963776fd0..aef0d86700 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -1139,12 +1139,12 @@ func MakeManifestData(appName string, appURL string, absoluteAssetURL string) [] StartURL: appURL, Icons: []manifestIcon{ { - Src: absoluteAssetURL + "/img/logo.png", + Src: absoluteAssetURL + "/assets/img/logo.png", Type: "image/png", Sizes: "512x512", }, { - Src: absoluteAssetURL + "/img/logo.svg", + Src: absoluteAssetURL + "/assets/img/logo.svg", Type: "image/svg+xml", Sizes: "512x512", }, diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 7b175bfab3..8f1362afc4 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -61,7 +61,7 @@ func NewFuncMap() []template.FuncMap { return setting.AppSubURL }, "StaticUrlPrefix": func() string { - return setting.StaticURLPrefix + return setting.StaticURLPrefix + "/assets" }, "AppUrl": func() string { return setting.AppURL |