forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: [skip ci] Updated licenses and gitignores Prevent anonymous container access if `RequireSignInView` is enabled (go-gitea#28877) Don't show new pr button when page is not compare pull (go-gitea#26431) Avoid duplicate JS error messages on UI (go-gitea#28873) Fix branch list bug which displayed default branch twice (go-gitea#28878) Revert adding htmx until we finaly decide to add it (go-gitea#28879) Don't do a full page load when clicking the follow button (go-gitea#28872) Don't do a full page load when clicking the subscribe button (go-gitea#28871) Fix incorrect PostgreSQL connection string for Unix sockets (go-gitea#28865) Run `npm audit fix` (go-gitea#28866) Fix migrate storage bug (go-gitea#28830) Set the `isPermaLink` attribute to `false` in the `guid` sub-element (go-gitea#28860) In administration documentation about environment variables, point to those for the Go runtime instead of Go compiler (go-gitea#28859) Move doctor package from modules to services (go-gitea#28856) Add support for sha256 repositories (go-gitea#23894) Fix incorrect action duration time when rerun the job before executed once (go-gitea#28364) Fix some RPM registry flaws (go-gitea#28782) tests: missing refs/ in bare repositories (go-gitea#28844) Fix archive creating LFS hooks and breaking pull requests (go-gitea#28848)
- Loading branch information
Showing
159 changed files
with
1,896 additions
and
614 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
models/migrations/fixtures/Test_RepositoryFormat/repository.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| # type Repository struct { | ||
| # ID int64 `xorm:"pk autoincr"` | ||
| # } | ||
| - | ||
| id: 1 | ||
| - | ||
| id: 2 | ||
| - | ||
| id: 3 | ||
| - | ||
| id: 10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Copyright 2023 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package v1_22 //nolint | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "xorm.io/xorm" | ||
| ) | ||
|
|
||
| func AddPreviousDurationToActionRun(x *xorm.Engine) error { | ||
| type ActionRun struct { | ||
| PreviousDuration time.Duration | ||
| } | ||
|
|
||
| return x.Sync(&ActionRun{}) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| // Copyright 2023 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
| package v1_22 //nolint | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
|
|
||
| "code.gitea.io/gitea/modules/log" | ||
| "code.gitea.io/gitea/modules/setting" | ||
|
|
||
| "xorm.io/xorm" | ||
| ) | ||
|
|
||
| func expandHashReferencesToSha256(x *xorm.Engine) error { | ||
| alteredTables := [][2]string{ | ||
| {"commit_status", "context_hash"}, | ||
| {"comment", "commit_sha"}, | ||
| {"pull_request", "merge_base"}, | ||
| {"pull_request", "merged_commit_id"}, | ||
| {"review", "commit_id"}, | ||
| {"review_state", "commit_sha"}, | ||
| {"repo_archiver", "commit_id"}, | ||
| {"release", "sha1"}, | ||
| {"repo_indexer_status", "commit_sha"}, | ||
| } | ||
|
|
||
| db := x.NewSession() | ||
| defer db.Close() | ||
|
|
||
| if err := db.Begin(); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if !setting.Database.Type.IsSQLite3() { | ||
| if setting.Database.Type.IsMSSQL() { | ||
| // drop indexes that need to be re-created afterwards | ||
| droppedIndexes := []string{ | ||
| "DROP INDEX commit_status.IDX_commit_status_context_hash", | ||
| "DROP INDEX review_state.UQE_review_state_pull_commit_user", | ||
| "DROP INDEX repo_archiver.UQE_repo_archiver_s", | ||
| } | ||
| for _, s := range droppedIndexes { | ||
| _, err := db.Exec(s) | ||
| if err != nil { | ||
| return errors.New(s + " " + err.Error()) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| for _, alts := range alteredTables { | ||
| var err error | ||
| if setting.Database.Type.IsMySQL() { | ||
| _, err = db.Exec(fmt.Sprintf("ALTER TABLE `%s` MODIFY COLUMN `%s` VARCHAR(64)", alts[0], alts[1])) | ||
| } else if setting.Database.Type.IsMSSQL() { | ||
| _, err = db.Exec(fmt.Sprintf("ALTER TABLE `%s` ALTER COLUMN `%s` VARCHAR(64)", alts[0], alts[1])) | ||
| } else { | ||
| _, err = db.Exec(fmt.Sprintf("ALTER TABLE `%s` ALTER COLUMN `%s` TYPE VARCHAR(64)", alts[0], alts[1])) | ||
| } | ||
| if err != nil { | ||
| return fmt.Errorf("alter column '%s' of table '%s' failed: %w", alts[1], alts[0], err) | ||
| } | ||
| } | ||
|
|
||
| if setting.Database.Type.IsMSSQL() { | ||
| recreateIndexes := []string{ | ||
| "CREATE INDEX IDX_commit_status_context_hash ON commit_status(context_hash)", | ||
| "CREATE UNIQUE INDEX UQE_review_state_pull_commit_user ON review_state(user_id, pull_id, commit_sha)", | ||
| "CREATE UNIQUE INDEX UQE_repo_archiver_s ON repo_archiver(repo_id, type, commit_id)", | ||
| } | ||
| for _, s := range recreateIndexes { | ||
| _, err := db.Exec(s) | ||
| if err != nil { | ||
| return errors.New(s + " " + err.Error()) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| log.Debug("Updated database tables to hold SHA256 git hash references") | ||
|
|
||
| return db.Commit() | ||
| } | ||
|
|
||
| func addObjectFormatNameToRepository(x *xorm.Engine) error { | ||
| type Repository struct { | ||
| ObjectFormatName string `xorm:"VARCHAR(6) NOT NULL DEFAULT 'sha1'"` | ||
| } | ||
|
|
||
| if err := x.Sync(new(Repository)); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Here to catch weird edge-cases where column constraints above are | ||
| // not applied by the DB backend | ||
| _, err := x.Exec("UPDATE repository set object_format_name = 'sha1' WHERE object_format_name = '' or object_format_name IS NULL") | ||
| return err | ||
| } | ||
|
|
||
| func AdjustDBForSha256(x *xorm.Engine) error { | ||
| if err := expandHashReferencesToSha256(x); err != nil { | ||
| return err | ||
| } | ||
| return addObjectFormatNameToRepository(x) | ||
| } |
Oops, something went wrong.