Skip to content

Update and add new patches for Gitea v1.26.2#22

Merged
bartvdbraak merged 1 commit into
cifrom
patches-v1.26.2
Jun 11, 2026
Merged

Update and add new patches for Gitea v1.26.2#22
bartvdbraak merged 1 commit into
cifrom
patches-v1.26.2

Conversation

@brechtvl

@brechtvl brechtvl commented Jun 9, 2026

Copy link
Copy Markdown
Collaborator

Added two patches:

  • Allow maintainers to push Git LFS
  • Workaround CODEOWNERS mistakes by rejecting if more than 10 are added

Removed two patches, for issues fixed upstream:

  • 0013-BLENDER-Fix-RemoveUserBadges-incorrect-sql.patch
  • 0021-BLENDER-Backport-Fix-CODEOWNERS-review-request-attri.patch

Resolved various conflicts, including move of translation from .ini to .json files.

Added two patches:
* Allow maintainers to push Git LFS
* Workaround CODEOWNERS mistakes by rejecting if more than 10 are added

Removed two patches, for issues fixed upstream:
- 0013-BLENDER-Fix-RemoveUserBadges-incorrect-sql.patch
- 0021-BLENDER-Backport-Fix-CODEOWNERS-review-request-attri.patch

Resolved various conflicts, including move of translation from .ini
to .json files.
@brechtvl brechtvl requested review from bartvdbraak and komarov June 9, 2026 12:34
@bartvdbraak

Copy link
Copy Markdown
Member

Thanks @brechtvl!

Will test a deploy to Staging as soon as possible :)

@komarov komarov left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I've read through 0013, 0014, 0019 and could trace all the required modifications to their corresponding upstream changes, so makes total sense to me. Thanks for taking care of those!

@bartvdbraak

Copy link
Copy Markdown
Member

Deploying this to Staging today and will try to do some actual user testing on some of the customized features.

@bartvdbraak

Copy link
Copy Markdown
Member

Did a bunch of testing and couldn't find any issues.

@bartvdbraak bartvdbraak merged commit 16270c5 into ci Jun 11, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants