Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[BRANDING] Use forgejo binary name

Browse source 
- Use `forgejo` binary name for migration suggestions.
- Resolves https://codeberg.org/forgejo/forgejo/issues/869#issuecomment-944501

(cherry picked from commit 418a0bed8f831b72b206ca415d99c99824bec839)
(cherry picked from commit 734579ce9b0f66b61b4a08f605695af9db1d4f4e)
(cherry picked from commit 8b7cf605f2a9eda78383fe2baf407bfe9364a783)
(cherry picked from commit c59e1a4e61c551e50a86ea28d31f91507ba7c3c1)
(cherry picked from commit e3877892e13c889e4b46a5478d60e0781ac3db6b)
(cherry picked from commit d7249a4b847d7b87811624f9c2a3366f1fe92495)
This commit is contained in:
Gusted 2023-06-18 20:34:26 +02:00 committed by Earl Warren
parent 1ce2f72355
commit f2ecd46d96
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/migrations/migrations.go
View file

@ -540,7 +540,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 nil

2
routers/common/db.go
View file

@ -51,7 +51,7 @@ func migrateWithSetting(x *xorm.Engine) error {
return migrations.Migrate(x)
} else if expected := migrations.ExpectedVersion(); current != expected {
log.Fatal(`"database.AUTO_MIGRATION" is disabled, but current database version %d is not equal to the expected version %d.`+
`You can set "database.AUTO_MIGRATION" to true or migrate manually by running "gitea [--config /path/to/app.ini] migrate"`, current, expected)
`You can set "database.AUTO_MIGRATION" to true or migrate manually by running "forgejo [--config /path/to/app.ini] migrate"`, current, expected)
}
return nil
}