luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-19 00:10:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[PORT] Refactor DateUtils and merge TimeSince (gitea#32409)

Browse source 
Follow #32383 and #32402

---
Conflict resolution: Magic, painful.

(cherry picked from commit b068dbd40ee3b4dc7d18cdcf168f0c24cea234c0)
This commit is contained in:
wxiaoguang 2024-11-04 19:30:00 +08:00 • committed by Gusted
parent 8f6dfe29da
commit 7e1aa8a5cd
No known key found for this signature in database
GPG key ID: FD821B732837125F
74 changed files with 241 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

3
routers/web/repo/blame.go
View file

@ -17,7 +17,6 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/templates"
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/services/context"
files_service "code.gitea.io/gitea/services/repository/files"
@ -254,7 +253,7 @@ func renderBlame(ctx *context.Context, blameParts []*git.BlamePart, commitNames
commitCnt++
// User avatar image
commitSince := timeutil.TimeSinceUnix(timeutil.TimeStamp(commit.Author.When.Unix()), ctx.Locale)
commitSince := templates.TimeSince(commit.Author.When)
var avatar string
if commit.User != nil {