Merge branch 'rebase-forgejo-branding' into forgejo

This commit is contained in:
Earl Warren 2024-01-15 18:28:27 +00:00
commit 691e4f3253
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
132 changed files with 1321 additions and 333 deletions

View file

@ -596,7 +596,7 @@ func EnsureUpToDate(x *xorm.Engine) error {
expected := ExpectedVersion()
if currentDB != expected {
return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "gitea [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected)
return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "forgejo [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected)
}
return forgejo_migrations.EnsureUpToDate(x)