jojo/templates
forgejo-backport-action a89978a207 [v14.0/forgejo] fix: allow Actions trust management on conflicted PRs (#10600)
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/10594

Fixes #10589.

![20251226_134200](/attachments/0aac3594-62d7-467f-82f2-2d9063fb5ffb)

## Checklist

The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org).

### Tests

- I added test coverage for Go changes...
  - [ ] in their respective `*_test.go` for unit tests.
  - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server.
- I added test coverage for JavaScript changes...
  - [ ] in `web_src/js/*.test.js` if it can be unit tested.
  - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)).

### Documentation

- [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.
- [x] I did not document these changes and I do not expect someone else to do it.

### Release notes

- [ ] I do not want this change to show in the release notes.
- [x] I want the title to show in the release notes with a link to this pull request.
- [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title.

Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10600
Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
2025-12-27 17:24:50 +01:00
..
admin fix: 'More actions' (⋯) dropdown from moderation reports overview page (#10339) 2025-12-10 17:09:59 +01:00
api/packages/pypi Update templates/api/packages/pypi/simple.tmpl 2024-04-12 16:43:30 +00:00
base fix(ui): do not wrongly highlight devtest link in navbar menu (#10357) 2025-12-07 17:44:28 +01:00
custom [FEAT] Repository flags 2024-02-05 16:09:42 +01:00
devtest fix(ui/buttons): implement .disabled class (#10410) 2025-12-16 14:18:08 +01:00
explore fix(ui): use octicon-repo-forked in repo list (#10227) 2025-11-26 11:21:20 +01:00
htmx fix(ui): Make 'Clear milestone' work with HTMX (#8266) 2025-08-11 20:10:10 +02:00
mail fix: release email links (#9690) 2025-10-16 16:12:32 +02:00
moderation feat: replace cross origin protection (#9830) 2025-10-29 22:43:22 +01:00
org feat(ui): allow dropdown to contain not just items (#9951) 2025-11-05 05:00:15 +01:00
package feat: replace cross origin protection (#9830) 2025-10-29 22:43:22 +01:00
projects feat: replace cross origin protection (#9830) 2025-10-29 22:43:22 +01:00
repo [v14.0/forgejo] fix: allow Actions trust management on conflicted PRs (#10600) 2025-12-27 17:24:50 +01:00
shared [v14.0/forgejo] feat(ui): show update time when sorting by recently updated (#10500) 2025-12-20 16:22:36 +01:00
status fix(ui): remove extra helpers from statuspages (#9753) 2025-10-20 12:03:58 +02:00
swagger Revert "feat: add support for ephemeral runners compatible with autoscaling tools (#9409)" (#10463) 2025-12-19 17:24:03 +01:00
user feat: use AppDomain for key verification (#10429) 2025-12-17 17:01:14 +01:00
webhook fix: less restrictive matrix room_id pattern (#10056) 2025-11-11 04:45:15 +01:00
home.tmpl Split Forgejo landing page template to allow patching or removing Forgejo introduction section (#6675) 2025-02-03 08:41:52 +00:00
home_forgejo.tmpl Split Forgejo landing page template to allow patching or removing Forgejo introduction section (#6675) 2025-02-03 08:41:52 +00:00
install.tmpl Added alt's to <img> 2025-01-31 21:22:00 +00:00
post-install.tmpl [BRANDING] Custom loading animation for Forgejo 2024-02-05 16:02:13 +01:00