diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-08-24 17:24:45 +0800 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2019-08-24 11:24:45 +0200 |
| commit | f83db078f0603c775cd1b1bb016f996b65a04835 (patch) | |
| tree | 9895f852c768d43b384ba36259b44d9506b04093 /routers/admin | |
| parent | 26af3401c36e6316b81b92bf6a776bf2442d251c (diff) | |
| download | gitea-f83db078f0603c775cd1b1bb016f996b65a04835.tar.gz gitea-f83db078f0603c775cd1b1bb016f996b65a04835.zip | |
Move database settings from models to setting (#7806)
* move database settings from models to setting
* update docs
* fix checkout pr
* fix tests
* fix lint
* remove unsupported tidb options
* correct wrong variable name
* remove tidb totally
Diffstat (limited to 'routers/admin')
| -rw-r--r-- | routers/admin/admin.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 54fbddc58e..496aca375f 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -289,7 +289,7 @@ func Config(ctx *context.Context) { ctx.Data["LFS"] = setting.LFS ctx.Data["Service"] = setting.Service - ctx.Data["DbCfg"] = models.DbCfg + ctx.Data["DbCfg"] = setting.Database ctx.Data["Webhook"] = setting.Webhook ctx.Data["MailerEnabled"] = false @@ -333,7 +333,7 @@ func Config(ctx *context.Context) { ctx.Data["AccessLogTemplate"] = setting.AccessLogTemplate ctx.Data["DisableRouterLog"] = setting.DisableRouterLog ctx.Data["EnableXORMLog"] = setting.EnableXORMLog - ctx.Data["LogSQL"] = setting.LogSQL + ctx.Data["LogSQL"] = setting.Database.LogSQL ctx.HTML(200, tplConfig) } |