diff options
| author | Gusted <williamzijl7@hotmail.com> | 2022-01-24 22:11:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 00:11:40 +0200 |
| commit | 43c6b27716381dad9debd2ebbd9e1ae332af23b2 (patch) | |
| tree | ea2c11a43f42ef77ad68684d863cdf7bee9b9fa2 /templates | |
| parent | 9837773f0e5267297e99b7267c9f19d23d63232d (diff) | |
| download | gitea-43c6b27716381dad9debd2ebbd9e1ae332af23b2.tar.gz gitea-43c6b27716381dad9debd2ebbd9e1ae332af23b2.zip | |
Fix commit's time (#18375)
* Fix commit's time
- Use the Committer's `when` as the CommitDate will be modified when the
commit is being moved around in the git tree(e.g. being rebased on top
of newer commits). The Author's `when` is created once and never touched
again.
* Update templates/repo/view_list.tmpl
* Commmt unstaged
* Add fallback
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/commits_list.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/view_list.tmpl | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index 7bc37175c2..e8ac4020f4 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -75,7 +75,11 @@ <pre class="commit-body" style="display: none;">{{RenderCommitBody $.Context .Message $commitRepoLink $.Repository.ComposeMetas}}</pre> {{end}} </td> - <td class="text right aligned">{{TimeSince .Author.When $.Lang}}</td> + {{if .Committer}} + <td class="text right aligned">{{TimeSince .Committer.When $.Lang}}</td> + {{else}} + <td class="text right aligned">{{TimeSince .Author.When $.Lang}}</td> + {{end}} </tr> {{end}} </tbody> diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 870bbb92e8..b123096777 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -34,7 +34,7 @@ </span> {{end}} </th> - <th class="text grey right age">{{if .LatestCommit}}{{if .LatestCommit.Author}}{{TimeSince .LatestCommit.Author.When $.Lang}}{{end}}{{end}}</th> + <th class="text grey right age">{{if .LatestCommit}}{{if .LatestCommit.Committer}}{{TimeSince .LatestCommit.Committer.When $.Lang}}{{end}}{{end}}</th> </tr> </thead> <tbody> |