Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-06-05 02:56:34 +02:00
Code Issues Activity

fix: use committer time where ever possible as default (#37969)

Browse Source 
Fix https://github.com/go-gitea/gitea/issues/37857

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
puni9869 2026-06-02 12:38:23 +05:30 committed by GitHub
parent 9619d93e3b
commit 79810ba2e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -64,4 +64,4 @@ metiftikci <metiftikci@hotmail.com> (@metiftikci)
Christopher Homberger <christopher.homberger@web.de> (@ChristopherHX)
Tobias Balle-Petersen <tobiasbp@gmail.com> (@tobiasbp)
TheFox <thefox0x7@gmail.com> (@TheFox0x7)
Nicolas <bircni@icloud.com> (@bircni)
Nicolas <bircni@icloud.com> (@bircni)

6
routers/web/repo/wiki.go
View File

@ -496,7 +496,7 @@ func Wiki(ctx *context.Context) {
ctx.ServerError("GetCommitByPath", err)
return
}
ctx.Data["Author"] = lastCommit.Author
ctx.Data["Committer"] = lastCommit.Committer
ctx.HTML(http.StatusOK, tplWikiView)
}
@ -528,7 +528,7 @@ func WikiRevision(ctx *context.Context) {
ctx.ServerError("GetCommitByPath", err)
return
}
ctx.Data["Author"] = lastCommit.Author
ctx.Data["Committer"] = lastCommit.Committer
ctx.HTML(http.StatusOK, tplWikiRevision)
}
@ -587,7 +587,7 @@ func WikiPages(ctx *context.Context) {
Name: displayName,
SubURL: wiki_service.WebPathToURLPath(wikiName),
GitEntryName: entry.Entry.Name(),
UpdatedUnix: timeutil.TimeStamp(entry.Commit.Author.When.Unix()),
UpdatedUnix: timeutil.TimeStamp(entry.Commit.Committer.When.Unix()),
})
}
ctx.Data["Pages"] = pages

3
templates/repo/commit_page.tmpl
View File

@ -139,8 +139,7 @@
<strong>{{.Commit.Author.Name}}</strong>
{{end}}
</div>
<span class="tw-text-text-light">{{DateUtils.TimeSince .Commit.Author.When}}</span>
<span class="tw-text-text-light">{{DateUtils.TimeSince .Commit.Committer.When}}</span>
<div class="flex-text-inline">
{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}

4
templates/repo/wiki/revision.tmpl
View File

@ -9,8 +9,8 @@
<div class="tw-flex-1 gt-ellipsis">
{{$title}}
<div class="ui sub header gt-ellipsis">
{{$timeSince := DateUtils.TimeSince .Author.When}}
{{ctx.Locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince}}
{{$timeSince := DateUtils.TimeSince .Committer.When}}
{{ctx.Locale.Tr "repo.wiki.last_commit_info" .Committer.Name $timeSince}}
</div>
</div>
</div>

4
templates/repo/wiki/view.tmpl
View File

@ -37,8 +37,8 @@
<div class="tw-flex-1 gt-ellipsis">
{{$title}}
<div class="ui sub header gt-ellipsis">
{{$timeSince := DateUtils.TimeSince .Author.When}}
{{ctx.Locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince}}
{{$timeSince := DateUtils.TimeSince .Committer.When}}
{{ctx.Locale.Tr "repo.wiki.last_commit_info" .Committer.Name $timeSince}}
</div>
</div>
</div>

22
tests/integration/repo_commits_test.go
View File

@ -69,6 +69,28 @@ func TestRepoCommits(t *testing.T) {
assert.Equal(t, "6543", strings.TrimSpace(authorElem.Text()))
})
t.Run("CommitPageUsesCommitterDate", func(t *testing.T) {
const (
commitID = "5099b81332712fe655e34e8dd63574f503f61811"
expectedCommitterTime = "2017-08-06T19:56:13+02:00"
authorTime = "2017-08-06T19:55:01+02:00"
)
req := NewRequest(t, "GET", "/user2/repo16/commits/branch/master")
resp := session.MakeRequest(t, req, http.StatusOK)
doc := NewHTMLParser(t, resp.Body)
var commitListTime string
doc.doc.Find("#commits-table tbody tr").EachWithBreak(func(_ int, row *goquery.Selection) bool {
if path.Base(row.Find(".commit-id-short").AttrOr("href", "")) != commitID {
return true
}
commitListTime = row.Find("td").Eq(3).Find("relative-time").AttrOr("datetime", "")
return false
})
require.Equal(t, expectedCommitterTime, commitListTime)
})
t.Run("LastCommitNonExistingCommiter", func(t *testing.T) {
req := NewRequest(t, "GET", "/user2/repo1/src/branch/branch2")
resp := session.MakeRequest(t, req, http.StatusOK)