Skip to content

nit fix #19116

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 3 commits into from
Mar 17, 2022
Merged

nit fix #19116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0094837
nit fix
6543 Mar 17, 2022
8c4a05f
Merge branch 'master' into nit-fix
6543 Mar 17, 2022
d4c8448
unrelated code docs nit
6543 Mar 17, 2022
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
3 changes: 3 additions & 0 deletions models/migrations/migrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,9 @@ var migrations = []Migration{
NewMigration("Increase WebAuthentication CredentialID size to 410 - NO-OPED", increaseCredentialIDTo410),
// v210 -> v211
NewMigration("v208 was completely broken - remigrate", remigrateU2FCredentials),

// Gitea 1.16.2 ends at v211

// v211 -> v212
NewMigration("Create ForeignReference table", createForeignReferenceTable),
}
Expand Down
3 changes: 1 addition & 2 deletions modules/markup/html.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,7 @@ func postProcess(ctx *RenderContext, procs []processor, input io.Reader, output

// Render everything to buf.
for _, node := range newNodes {
err = html.Render(output, node)
if err != nil {
if err := html.Render(output, node); err != nil {
return &postProcessError{"error rendering processed HTML", err}
}
}
Expand Down