From 648d9e253c1924b832248f26fee42b2fb64dc3bc Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Sat, 22 Feb 2020 09:05:26 +0800 Subject: conf: overhaul server settings (#5928) * conf: rename package * Requires Go 1.12 * Fix lint * Fix lint * Overhaul * db: fix tests * Save my work * Fix tests * Server.UnixSocketPermission * Server.LocalRootURL * SSH settings * Server.OfflineMode * Save my work * App.Version * Remove [server] STATIC_ROOT_PATH * Server.LandingURL --- internal/context/notice.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/context/notice.go') diff --git a/internal/context/notice.go b/internal/context/notice.go index dea72043..6f825fd8 100644 --- a/internal/context/notice.go +++ b/internal/context/notice.go @@ -6,20 +6,20 @@ package context import ( "os" - "path" + "path/filepath" "github.com/unknwon/com" log "unknwon.dev/clog/v2" + "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/markup" - "gogs.io/gogs/internal/setting" "gogs.io/gogs/internal/tool" ) // renderNoticeBanner checks if a notice banner file exists and loads the message to display // on all pages. func (c *Context) renderNoticeBanner() { - fpath := path.Join(setting.CustomPath, "notice", "banner.md") + fpath := filepath.Join(conf.CustomDir(), "notice", "banner.md") if !com.IsExist(fpath) { return } -- cgit v1.2.3