b2b3225b - gitea

Authored by: zeripath
Authored at: 2022-02-11 05:02:04 +0000
Committed by: GitHub
Committed at: 2022-02-11 13:02:04 +0800
Signature: View
-----BEGIN PGP SIGNATURE----- wsBcBAABCAAQBQJiBe3MCRBK7hj4Ov3rIwAAHw4IAItZiBH2gDmOajGZ50/IZDcG kaSBhHlHQSztgp37GIBvMntAbVMnu/xzDAkHeuqEKORIeBPsovdR+RM+ABfKg9Tu 8nICpeHUHiVZxPTP9M40F8bMkvY4Kdk3LSZj4rjV2YwPUJlIakKo0oVd/HNm6Wrg H/lQCmbBKweofGwyIfyViTkHRAVdssJKyhn1Y1ST7Sj7ZaA9SXG7eEjFFDSjOugY ubJOnMbxD2yUbSV98ZCbnOfLenduJvhCNAACWkEyTVLArAMjP+xdLwPglFbc3lGc Fwu///XMRAlawgA68KGAwi3zgeGnxifGcRbawbVsYatGRbNmpSo58/rAKcktnrc= =nf0U -----END PGP SIGNATURE-----
Object name: b2b3225bd1f6d6ff519d7a464c7fcf7ff0c6bdcc
Parent: f9e7edc5

Prevent double encoding of branch names in delete branch (#18714) * Prevent double encoding of branch names in delete branch There is a double encoding issue in branch template whereby the branch name ends up double encoded. Fix #18709 Signed-off-by: Andrew Thornton <art27@cantab.net> * and tag name Signed-off-by: Andrew Thornton <art27@cantab.net> * And fix #18704 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

Changes

3 changed files (+4/-4)

templates/mail/issue/assigned.tmpl
- @@ -9,7 +9,7 @@
 </head> {{$repo_url := printf "<a href='%s'>%s</a>" (Escape .Issue.Repo.HTMLURL) (Escape .Issue.Repo.FullName)}} - {{$link := printf "<a href='%s'>#%d</a>" (Escape .Link) (Escape .Issue.Index)}} + {{$link := printf "<a href='%s'>#%d</a>" (Escape .Link) .Issue.Index}} <body> {{if .IsPull}}
templates/repo/branch/list.tmpl
- @@ -121,9 +121,9 @@
 {{end}} {{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}} {{if .IsDeleted}} - <a class="ui basic jump button icon tooltip undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID}}&name={{PathEscapeSegments .DeletedBranch.Name}}" data-content="{{$.i18n.Tr "repo.branch.restore" (.Name)}}" data-position="top right">{{svg "octicon-reply"}}</a> + <a class="ui basic jump button icon tooltip undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID}}&name={{.DeletedBranch.Name}}" data-content="{{$.i18n.Tr "repo.branch.restore" (.Name)}}" data-position="top right">{{svg "octicon-reply"}}</a> {{else}} - <a class="ui basic jump button icon tooltip delete-button delete-branch-button" href data-url="{{$.Link}}/delete?name={{PathEscapeSegments .Name}}" data-content="{{$.i18n.Tr "repo.branch.delete" (.Name)}}" data-position="top right" data-name="{{.Name}}"> + <a class="ui basic jump button icon tooltip delete-button delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name}}" data-content="{{$.i18n.Tr "repo.branch.delete" (.Name)}}" data-position="top right" data-name="{{.Name}}"> {{svg "octicon-trash"}} </a> {{end}}
templates/repo/release/list.tmpl
- @@ -40,7 +40,7 @@
 <a class="archive-link mr-3" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.zip" rel="nofollow">{{svg "octicon-file-zip" 16 "mr-2"}}ZIP</a> <a class="archive-link mr-3" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip" 16 "mr-2"}}TAR.GZ</a> {{if (and $.CanCreateRelease $release.IsTag)}} - <a class="mr-3" href="{{$.RepoLink}}/releases/new?tag={{.TagName | PathEscapeSegments}}">{{svg "octicon-tag" 16 "mr-2"}}{{$.i18n.Tr "repo.release.new_release"}}</a> + <a class="mr-3" href="{{$.RepoLink}}/releases/new?tag={{.TagName}}">{{svg "octicon-tag" 16 "mr-2"}}{{$.i18n.Tr "repo.release.new_release"}}</a> {{end}} {{if (and ($.Permission.CanWrite $.UnitTypeCode) $release.IsTag)}} <a class="ui red delete-button mr-3" data-url="{{$.RepoLink}}/tags/delete" data-id="{{.ID}}">