Skip to content

Conversation

@bartvdbraak
Copy link
Contributor

@bartvdbraak bartvdbraak commented Jun 14, 2025

ignore, accidental creation.

bartvdbraak and others added 30 commits November 22, 2024 09:39
Docker build based on latest upstream release tags with our custom
patches applied on top
CONFLICT (modify/delete): services/repository/review.go deleted in HEAD and modified in BLENDER: Don't allow assigning large teams as reviewers. Version BLENDER: Don't allow assigning large teams as reviewers of services/repository/review.go left in tree.
Applying: BLENDER: Fix overflow menu flickering on mobile
Using index info to reconstruct a base tree...
M       web_src/js/webcomponents/overflow-menu.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

Applying: BLENDER: Fix slow patch checking with commits that add or remove many files
Using index info to reconstruct a base tree...
M       modules/git/repo_index.go
M       services/pull/patch.go
Falling back to patching base and 3-way merge...
Auto-merging services/pull/patch.go
Auto-merging modules/git/repo_index.go
No changes -- Patch already applied.
I removed the renaming utility script and left the default patch names
for easier lookup.
Spam reporting is available for trusted users (org members and admins) via a
button on a spammer's profile page;
a new section Site Administration > Identity & Access > Spam Reports;
a new "pending spam reports" indicator in the header for admins.

See #7 for the code review.

---------

Co-authored-by: Oleg Komarov <[email protected]>
* Fix lint in Blender ID patch

* Patches to improve online editing of the Blender manual

Submitted upstream as 34240
This change will no longer be needed for v1.23.7.
* Reformat and Change Commit titles

* Add Patch for Cursor indicator while editing
Only source access is considered expensive, based on what AI bots seem to
spend most time accessing.
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 14, 2025
@GiteaBot
Copy link
Collaborator

@bartvdbraak I noticed you've updated the locales for non-English languages. These will be overwritten during the sync from our translation tool Crowdin. If you'd like to contribute your translations, please visit https://crowdin.com/project/gitea. Please revert the changes done on these files. 🍵

@github-actions github-actions bot added modifies/translation modifies/go Pull requests that update Go code modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin modifies/docs modifies/migrations modifies/internal modifies/dependencies docs-update-needed The document needs to be updated synchronously labels Jun 14, 2025
@bartvdbraak bartvdbraak changed the title WIP: Update patches for v1.24.0 ignore Jun 14, 2025
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 13, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

docs-update-needed The document needs to be updated synchronously lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin modifies/dependencies modifies/docs modifies/go Pull requests that update Go code modifies/internal modifies/migrations modifies/translation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants