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.2.2 (#16663) & Add test to ensure that dumping of login sources remains correct (#16847) #16849

Merged
merged 2 commits into from
Aug 28, 2021

Conversation

zeripath
Copy link
Contributor

Backport #16663

Fix #16683

Backport #16847

#16831 has occurred because of a missed regression. This PR adds a simple test to try to prevent this occurring again.

Co-authored-by: Lunny Xiao [email protected]

lunny and others added 2 commits August 27, 2021 20:17
Backport go-gitea#16663

Fix go-gitea#16683

* Upgrade xorm to v1.2.2

* Change the Engine interface to match xorm v1.2.2
…gitea#16847)

go-gitea#16831 has occurred because of a missed regression. This PR adds a simple test to
try to prevent this occuring again.

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath added this to the 1.14.7 milestone Aug 27, 2021
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Aug 28, 2021
@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 Aug 28, 2021
@6543 6543 merged commit 73e5c36 into go-gitea:release/v1.14 Aug 28, 2021
@zeripath zeripath deleted the backport-16663-v1.14 branch August 28, 2021 12:23
zeripath added a commit to zeripath/gitea that referenced this pull request Sep 2, 2021
## [1.14.7](https://github.com/go-gitea/gitea/releases/tag/v1.14.7) - 2021-09-02

* BUGFIXES
  * Add missing gitRepo close at GetDiffRangeWithWhitespaceBehavior (Partial go-gitea#16894) (go-gitea#16896)
  * Fix wiki raw commit diff/patch view (go-gitea#16891) (go-gitea#16893)
  * Ensure wiki repos are all closed (go-gitea#16886) (go-gitea#16889)
  * Upgrade xorm to v1.2.2 (go-gitea#16663) & Add test to ensure that dumping of login sources remains correct (go-gitea#16847) (go-gitea#16849)
  * Recreate Tables should Recreate indexes on MySQL (go-gitea#16718) (go-gitea#16740)

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath mentioned this pull request Sep 2, 2021
zeripath added a commit that referenced this pull request Sep 2, 2021
## [1.14.7](https://github.com/go-gitea/gitea/releases/tag/v1.14.7) - 2021-09-02

* BUGFIXES
  * Add missing gitRepo close at GetDiffRangeWithWhitespaceBehavior (Partial #16894) (#16896)
  * Fix wiki raw commit diff/patch view (#16891) (#16893)
  * Ensure wiki repos are all closed (#16886) (#16889)
  * Upgrade xorm to v1.2.2 (#16663) & Add test to ensure that dumping of login sources remains correct (#16847) (#16849)
  * Recreate Tables should Recreate indexes on MySQL (#16718) (#16740)

Signed-off-by: Andrew Thornton <[email protected]>
zeripath added a commit to zeripath/gitea that referenced this pull request Sep 2, 2021
* BUGFIXES
  * Add missing gitRepo close at GetDiffRangeWithWhitespaceBehavior (Partial go-gitea#16894) (go-gitea#16896)
  * Fix wiki raw commit diff/patch view (go-gitea#16891) (go-gitea#16893)
  * Ensure wiki repos are all closed (go-gitea#16886) (go-gitea#16889)
  * Upgrade xorm to v1.2.2 (go-gitea#16663) & Add test to ensure that dumping of login sources remains correct (go-gitea#16847) (go-gitea#16849)
  * Recreate Tables should Recreate indexes on MySQL (go-gitea#16718) (go-gitea#16740)

Signed-off-by: Andrew Thornton <[email protected]>
lunny pushed a commit that referenced this pull request Sep 2, 2021
* BUGFIXES
  * Add missing gitRepo close at GetDiffRangeWithWhitespaceBehavior (Partial #16894) (#16896)
  * Fix wiki raw commit diff/patch view (#16891) (#16893)
  * Ensure wiki repos are all closed (#16886) (#16889)
  * Upgrade xorm to v1.2.2 (#16663) & Add test to ensure that dumping of login sources remains correct (#16847) (#16849)
  * Recreate Tables should Recreate indexes on MySQL (#16718) (#16740)

Signed-off-by: Andrew Thornton <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Oct 19, 2021
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. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants