Skip to content
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

Fix 'add-orgs' migration #2117

Merged
merged 6 commits into from
Aug 7, 2023
Merged

Fix 'add-orgs' migration #2117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b46ab7e
update dep xorm.io
6543 Aug 4, 2023
d7bb68f
remove unique constrain from tmp migration struct & they dont need js…
6543 Aug 4, 2023
fd47e38
make sure we only sync cols nothing else
6543 Aug 5, 2023
5a3ff15
Merge branch 'main' into fix_addOrgs_migration
6543 Aug 7, 2023
e96d6fd
use patch from pull
6543 Aug 7, 2023
1f2a0ba
not blocked anymore
6543 Aug 7, 2023
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
8 changes: 5 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ require (
github.com/docker/cli v20.10.24+incompatible
github.com/docker/distribution v2.8.2+incompatible
github.com/docker/docker v20.10.24+incompatible
github.com/docker/go-connections v0.4.0
github.com/docker/go-units v0.5.0
github.com/drone/envsubst v1.0.3
github.com/franela/goblin v0.0.0-20211003143422-0a4f594942bf
Expand Down Expand Up @@ -57,8 +58,8 @@ require (
k8s.io/api v0.27.1
k8s.io/apimachinery v0.27.1
k8s.io/client-go v0.27.1
xorm.io/builder v0.3.12
xorm.io/xorm v1.3.2
xorm.io/builder v0.3.13
xorm.io/xorm v1.3.3-0.20230726104636-c622cdaf893f
)

require (
Expand All @@ -73,7 +74,6 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davidmz/go-pageant v1.0.2 // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
Expand Down Expand Up @@ -155,3 +155,5 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace xorm.io/xorm => gitea.com/6543/xorm v1.3.3-0.20230807141308-fc77a3b490a8
Loading