diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-08-15 22:46:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 22:46:21 +0800 |
| commit | 85202d4784758573f80f93dbbda97a444e7ece99 (patch) | |
| tree | 7957506de8657463e79f121e1b79567ef1cc84a1 /routers/admin | |
| parent | 5a44be627c055d3e9eb406ec4a91579de78b6910 (diff) | |
| download | gitea-85202d4784758573f80f93dbbda97a444e7ece99.tar.gz gitea-85202d4784758573f80f93dbbda97a444e7ece99.zip | |
Display ui time with customize time location (#7792)
* display ui time with customize time location
* fix lint
* rename UILocation to DefaultUILocation
* move time related functions to modules/timeutil
* fix tests
* fix tests
* fix build
* fix swagger
Diffstat (limited to 'routers/admin')
| -rw-r--r-- | routers/admin/admin.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 370f816525..8339c1eaec 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -24,6 +24,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/timeutil" ) const ( @@ -78,7 +79,7 @@ var sysStatus struct { } func updateSystemStatus() { - sysStatus.Uptime = base.TimeSincePro(startTime, "en") + sysStatus.Uptime = timeutil.TimeSincePro(startTime, "en") m := new(runtime.MemStats) runtime.ReadMemStats(m) |