diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-23 07:38:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-22 19:38:25 -0400 |
| commit | d44e1565dadd09b4cdbb924479bf6e59a4d3c403 (patch) | |
| tree | eaf824f9bc2477f8a4b119056d2ffd26a672c0f7 /modules/context | |
| parent | f1173d6879cb26af21483037fae72542f3088408 (diff) | |
| download | gitea-d44e1565dadd09b4cdbb924479bf6e59a4d3c403.tar.gz gitea-d44e1565dadd09b4cdbb924479bf6e59a4d3c403.zip | |
Refactor `setting.Other` and remove unused `SHOW_FOOTER_BRANDING` (#24270)
The `SHOW_FOOTER_BRANDING` came from year 2015, and it seems nobody ever
uses it. It only shows an GitHub icon which seems unrelated to Gitea, it
doesn't do what document says. So, remove it.
## :warning: Breaking
Users can now remove the key `[other].SHOW_FOOTER_BRANDING` from their
app.ini.
Diffstat (limited to 'modules/context')
| -rw-r--r-- | modules/context/context.go | 3 | ||||
| -rw-r--r-- | modules/context/repo.go | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/modules/context/context.go b/modules/context/context.go index 7e986b0119..f262c7cce7 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -741,8 +741,7 @@ func Contexter(ctx context.Context) func(next http.Handler) http.Handler { ctx.Data["ShowRegistrationButton"] = setting.Service.ShowRegistrationButton ctx.Data["ShowMilestonesDashboardPage"] = setting.Service.ShowMilestonesDashboardPage - ctx.Data["ShowFooterBranding"] = setting.ShowFooterBranding - ctx.Data["ShowFooterVersion"] = setting.ShowFooterVersion + ctx.Data["ShowFooterVersion"] = setting.Other.ShowFooterVersion ctx.Data["EnableSwagger"] = setting.API.EnableSwagger ctx.Data["EnableOpenIDSignIn"] = setting.Service.EnableOpenIDSignIn diff --git a/modules/context/repo.go b/modules/context/repo.go index 1736de2e4b..6b811054c2 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -452,7 +452,7 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) { userName := ctx.Params(":username") repoName := ctx.Params(":reponame") repoName = strings.TrimSuffix(repoName, ".git") - if setting.EnableFeed { + if setting.Other.EnableFeed { repoName = strings.TrimSuffix(repoName, ".rss") repoName = strings.TrimSuffix(repoName, ".atom") } @@ -540,7 +540,7 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) { ctx.Data["RepoLink"] = ctx.Repo.RepoLink ctx.Data["RepoRelPath"] = ctx.Repo.Owner.Name + "/" + ctx.Repo.Repository.Name - if setting.EnableFeed { + if setting.Other.EnableFeed { ctx.Data["EnableFeed"] = true ctx.Data["FeedURL"] = ctx.Repo.RepoLink } |