diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-01-29 23:35:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 16:35:30 +0100 |
| commit | 0cd87d64ff8bb40520877d3a217363de299f4531 (patch) | |
| tree | d2ec167aea8f5b2ff673b13ba8be98a275d942ab /routers | |
| parent | 25b6255b924c30a2bab066c0465d146a34021245 (diff) | |
| download | gitea-0cd87d64ff8bb40520877d3a217363de299f4531.tar.gz gitea-0cd87d64ff8bb40520877d3a217363de299f4531.zip | |
Update docs and comments to remove macaron (#14491)
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/admin/admin.go | 1 | ||||
| -rw-r--r-- | routers/install.go | 2 | ||||
| -rw-r--r-- | routers/routes/web.go | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 250bc5da5e..c8f9d8b35b 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -308,7 +308,6 @@ func Config(ctx *context.Context) { ctx.Data["EnvVars"] = envVars ctx.Data["Loggers"] = setting.GetLogDescriptions() - ctx.Data["RedirectMacaronLog"] = setting.RedirectMacaronLog ctx.Data["EnableAccessLog"] = setting.EnableAccessLog ctx.Data["AccessLogTemplate"] = setting.AccessLogTemplate ctx.Data["DisableRouterLog"] = setting.DisableRouterLog diff --git a/routers/install.go b/routers/install.go index 5dcd1d48a3..da2631931e 100644 --- a/routers/install.go +++ b/routers/install.go @@ -371,8 +371,6 @@ func InstallPost(ctx *context.Context) { cfg.Section("log").Key("MODE").SetValue("console") cfg.Section("log").Key("LEVEL").SetValue(setting.LogLevel) cfg.Section("log").Key("ROOT_PATH").SetValue(form.LogRootPath) - cfg.Section("log").Key("REDIRECT_MACARON_LOG").SetValue("true") - cfg.Section("log").Key("MACARON").SetValue("console") cfg.Section("log").Key("ROUTER").SetValue("console") cfg.Section("security").Key("INSTALL_LOCK").SetValue("true") diff --git a/routers/routes/web.go b/routers/routes/web.go index 3fecb4dbbe..03555e3d54 100644 --- a/routers/routes/web.go +++ b/routers/routes/web.go @@ -215,7 +215,7 @@ func WebRoutes() *web.Route { return r } -// RegisterRoutes routes routes to Macaron +// RegisterRoutes register routes func RegisterRoutes(m *web.Route) { reqSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: true}) ignSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: setting.Service.RequireSignInView}) |