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.

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

Upgrade xorm to v1.0.0 #10646

Merged
merged 14 commits into from
Mar 22, 2020
Merged

Conversation

lunny
Copy link
Member

@lunny lunny commented Mar 7, 2020

As title.

@lunny lunny added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Mar 7, 2020
go.sum Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 7, 2020
@lunny lunny force-pushed the lunny/upgrade_xorm_1.0.0 branch 2 times, most recently from ae6313b to 2023f0a Compare March 10, 2020 15:57
@6543
Copy link
Member

6543 commented Mar 11, 2020

@lunny this will also fix some tests: ccaa6ba (from #10520)

@6543
Copy link
Member

6543 commented Mar 11, 2020

this pull will close #10520 too

routers/admin/auths.go Outdated Show resolved Hide resolved
@lunny lunny force-pushed the lunny/upgrade_xorm_1.0.0 branch 2 times, most recently from 621acd0 to da26ae7 Compare March 17, 2020 07:07
@lunny lunny marked this pull request as ready for review March 22, 2020 12:49
@lunny lunny added this to the 1.12.0 milestone Mar 22, 2020
@lunny lunny added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Mar 22, 2020
@GiteaBot GiteaBot removed the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 22, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 22, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 22, 2020
@techknowlogick techknowlogick merged commit c61b902 into go-gitea:master Mar 22, 2020
@lunny lunny deleted the lunny/upgrade_xorm_1.0.0 branch March 22, 2020 15:23
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants