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

Jump to bottom

Update xorm #22094

Merged
merged 2 commits into from
Dec 10, 2022
Merged

Update xorm #22094

merged 2 commits into from
Dec 10, 2022

Conversation

KN4CK3R
Copy link
Member

@KN4CK3R KN4CK3R commented Dec 10, 2022

No description provided.

@KN4CK3R KN4CK3R added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Dec 10, 2022
@KN4CK3R KN4CK3R added this to the 1.19.0 milestone Dec 10, 2022
@KN4CK3R KN4CK3R mentioned this pull request Dec 10, 2022
Merged
yardenshoham
yardenshoham approved these changes Dec 10, 2022
View reviewed changes
Copy link
Member

@yardenshoham yardenshoham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Dec 10, 2022
@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 Dec 10, 2022
@techknowlogick techknowlogick merged commit 0e2d046 into go-gitea:main Dec 10, 2022
@KN4CK3R KN4CK3R deleted the update-xorm branch December 11, 2022 10:32
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 12, 2022
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
8cb75e3 
* giteaofficial/main:
  Use multi reader instead to concat strings (go-gitea#22099)
  Fix sorting admin user list by last login (go-gitea#22081)
  Fix wrong default value for update checker on app.example.ini (go-gitea#22084)
  fix(config): remove context on config template (go-gitea#22096)
  [skip ci] Updated licenses and gitignores
  Update xorm (go-gitea#22094)
  Remove unnecessary whitespace in snapcraft.yaml (go-gitea#22090)
  Rename almost all Ctx functions (go-gitea#22071)
  Change ID pattern of raw content container for issue (go-gitea#21966)
  Optimize html templates (go-gitea#22080)
  Add API management for issue/pull and comment attachments (go-gitea#21783)
  Rename actions to operations on UI (go-gitea#22067)
  Update go dev dependencies (go-gitea#22064)
lunny added a commit that referenced this pull request Dec 14, 2022
@KN4CK3R @lunny @techknowlogick
Fix condition for is_internal (#22095)
07461e1 
depends on #22094

Fixes https://codeberg.org/forgejo/forgejo/issues/77

The old logic did not consider `is_internal`.

Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
KN4CK3R added a commit to KN4CK3R/gitea that referenced this pull request Dec 14, 2022
@KN4CK3R @lunny @techknowlogick
Fix condition for is_internal (go-gitea#22095)
547fa1b 
depends on go-gitea#22094

Fixes https://codeberg.org/forgejo/forgejo/issues/77

The old logic did not consider `is_internal`.

Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
KN4CK3R added a commit to KN4CK3R/gitea that referenced this pull request Dec 14, 2022
@KN4CK3R @lunny @techknowlogick
Fix condition for is_internal (go-gitea#22095)
9f5017d 
depends on go-gitea#22094

Fixes https://codeberg.org/forgejo/forgejo/issues/77

The old logic did not consider `is_internal`.

Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
@AbdulrhmnGhanem AbdulrhmnGhanem mentioned this pull request Dec 30, 2022
Merged
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@yardenshoham yardenshoham yardenshoham approved these changes

Assignees
No one assigned
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.
Projects
None yet
Milestone
1.19.0
Development

Successfully merging this pull request may close these issues.
5 participants
@KN4CK3R @yardenshoham @delvh @techknowlogick @GiteaBot