Skip to content

Add tag name in the commits list #31082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 19, 2024
Merged

Add tag name in the commits list #31082

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1a71028
Add tag name in the commits list
lunny May 26, 2024
303d00c
Add test for FindTagsByCommitIDs
lunny May 26, 2024
7b824a5
Add index for release sha1
lunny May 26, 2024
14475e9
Follow delvh's suggestion
lunny May 27, 2024
1e34774
Merge branch 'main' into lunny/commit_tags
lunny May 28, 2024
aebfe5c
Use shared tag name template
lunny May 28, 2024
ff3df39
Merge branch 'main' into lunny/commit_tags
lunny Aug 19, 2024
e4146f9
Revert unnecessary change
lunny Aug 19, 2024
fac2eb8
Some improvements
lunny Aug 19, 2024
5d81b68
Use locale for tags load failure
lunny Aug 19, 2024
b01ff3f
Merge branch 'main' into lunny/commit_tags
GiteaBot Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions routers/web/repo/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ func Commits(ctx *context.Context) {
}
commitsTagsMap, err := repo_model.FindTagsByCommitIDs(ctx, ctx.Repo.Repository.ID, commitIDs...)
if err != nil {
ctx.ServerError("CommitsByRange", err)
return
log.Error("FindTagsByCommitIDs: %v", err)
ctx.Flash.Error("Load tags failed because of internal error")
} else {
ctx.Data["CommitsTagsMap"] = commitsTagsMap
}
ctx.Data["CommitsTagsMap"] = commitsTagsMap
ctx.Data["Username"] = ctx.Repo.Owner.Name
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
ctx.Data["CommitCount"] = commitsCount
Expand Down
6 changes: 4 additions & 2 deletions templates/repo/commits_list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@
{{if IsMultilineCommitMessage .Message}}
<pre class="commit-body tw-hidden">{{RenderCommitBody $.Context .Message ($.Repository.ComposeMetas ctx)}}</pre>
{{end}}
{{range (index $.CommitsTagsMap .ID.String)}}
{{- template "repo/tag/name" dict "RepoLink" $.Repository.Link "TagName" .TagName "IsRelease" (not .IsTag) -}}
{{if $.CommitsTagsMap}}
{{range (index $.CommitsTagsMap .ID.String)}}
{{- template "repo/tag/name" dict "RepoLink" $.Repository.Link "TagName" .TagName "IsRelease" (not .IsTag) -}}
{{end}}
{{end}}
</td>
{{if .Committer}}
Expand Down