Michael Kriese
d81758d517
Merge pull request 'chore(renovate): explicit base branches' ( #5768 ) from viceice/chore/renovate into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5768
2024-11-01 13:04:38 +00:00
Michael Kriese
2322fdd7cd
chore(renovate): explicit base branches
...
So we can easier skip versions and renovate requires less runtime.
2024-11-01 13:00:55 +01:00
Earl Warren
c2452e17ca
Merge pull request 'Update infrastructure/next-digest action to v1.1.0 (forgejo)' ( #5766 ) from renovate/forgejo-infrastructure-next-digest-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5766
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-11-01 11:21:35 +00:00
Renovate Bot
ab936de02d
Update infrastructure/next-digest action to v1.1.0
2024-11-01 10:40:13 +00:00
forgejo-renovate-action
dbcd1eb426
Merge pull request 'Update linters (forgejo)' ( #5705 ) from renovate/forgejo-linters into forgejo
2024-11-01 10:29:03 +00:00
Michael Kriese
cdefcdb8fb
chore: downgrade stylelint
...
the newer version has blocking issues
2024-11-01 10:55:36 +01:00
Renovate Bot
41d949c73b
Update linters
2024-11-01 08:19:28 +00:00
Earl Warren
d49cc052aa
Merge pull request 'Update module code.forgejo.org/forgejo/act to v1.21.5 (forgejo)' ( #5762 ) from renovate/forgejo-code.forgejo.org-forgejo-act-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5762
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-11-01 06:25:00 +00:00
Renovate Bot
4764e17580
Update module code.forgejo.org/forgejo/act to v1.21.5
2024-11-01 00:03:59 +00:00
Otto
0e3d1e2d49
Merge pull request 'chore(ci): Enforce test label with CI check' ( #5756 ) from fnetx/pr-requirements into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5756
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-31 20:27:36 +00:00
Earl Warren
1ff8e1d409
Merge pull request 'fix: git-grep for code search when git version is below 2.38' ( #5746 ) from snematoda/git-grep-checkver-2 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5746
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-31 15:56:48 +00:00
Otto Richter
5da7f07fbe
chore(ci): Enforce test label with CI check
...
- test label needs to be set and either present, not-needed or manual
- if manual test label is set, PR description needs to contain a heading
(defined by '#') starting with "Test" (e.g. "Test instructions",
"Testing" etc)
2024-10-31 16:39:53 +01:00
Shiny Nematoda
f2ab4ff83a
fix(grep): fix git-grep for code search when git version is below 2.38
2024-10-31 15:24:53 +00:00
Earl Warren
9152c1d037
Merge pull request 'chore(ci): use rootless for the container images sent to k8s' ( #5755 ) from earl-warren/forgejo:wip-next-digest into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5755
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-10-31 12:32:02 +00:00
Earl Warren
b087cdc002
chore(ci): use rootless for the container images sent to k8s
...
The input to the action is not image_suffix but tag_suffix. It finds
an image and does not error. But it is the root image and the k8s
cluster needs the rootless image.
2024-10-31 12:24:40 +01:00
Earl Warren
adcc8d2f8d
Merge pull request 'Update dependency mermaid to v11.4.0 (forgejo)' ( #5751 ) from renovate/forgejo-mermaid-11.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5751
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-31 06:45:31 +00:00
Earl Warren
745b1e778e
Merge pull request 'feat: add branch deletion for scheduled PRs' ( #5689 ) from Tom3201/forgejo:tn-fix-branch-deletion into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5689
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-31 06:41:50 +00:00
Earl Warren
2d13cd4a47
chore(release-notes): Update dependency mermaid to v11.4.0
2024-10-31 07:15:14 +01:00
Tom Neuber
fc06763371
tests/integration: add integration tests for automerge pull requests
2024-10-31 03:49:15 +01:00
Tom Neuber
68d5cf0e92
Add branch auto deletion for scheduled PRs
2024-10-31 03:49:15 +01:00
Tom Neuber
3f01fb31d9
create "shared" package to workaround import loop issues
2024-10-31 03:49:14 +01:00
Otto
30838da15e
Merge pull request 'fix: reset history.scrollRestoration
if set to manual
and no issue anchor in url' ( #5684 ) from viceice/fix/ui/scroll-restoration into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5684
Reviewed-by: Otto <otto@codeberg.org>
2024-10-31 02:35:15 +00:00
Otto
698b1c07c4
Merge pull request 'fix: regression from #4125 ' ( #5560 ) from JakobDev/forgejo:linkfix into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5560
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-10-31 02:30:38 +00:00
forgejo-renovate-action
f2b4d90aee
Merge pull request 'Update dependency djlint to v1.35.3 (forgejo)' ( #5750 ) from renovate/forgejo-djlint-1.x into forgejo
2024-10-31 02:05:51 +00:00
Otto
099efe2bdd
Merge pull request 'Add typescript support' ( #5690 ) from anbraten/forgejo:ts into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5690
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-10-31 02:02:44 +00:00
Renovate Bot
78a7596454
Update dependency mermaid to v11.4.0
2024-10-31 00:04:49 +00:00
Renovate Bot
e467fe36dc
Update dependency djlint to v1.35.3
2024-10-31 00:04:20 +00:00
Earl Warren
f3ecc81a1b
Merge pull request 'chore(ci): notify the k8s cluster about experimental releases' ( #5747 ) from earl-warren/forgejo:wip-release-next-sync into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5747
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-10-30 20:16:47 +00:00
Earl Warren
dab156b452
chore(ci): notify the k8s cluster about experimental releases
...
This is in preparation of the migration of the v*.next.forgejo.org
instances currently managed at https://code.forgejo.org/infrastructure/k8s
The key difference is that the former system relies on ad-hoc scripts
and creates one k8s cluster for each instance, sharing nothing between
them.
The newer k8s cluster is used for all and requires significantly less
ad-hoc tooling.
See also:
* https://code.forgejo.org/infrastructure/next-digest
* https://code.forgejo.org/infrastructure/k8s-cluster/src/branch/main/k8s.md#updating-v-next-forgejo-org
2024-10-30 19:44:55 +01:00
Gusted
dfe3ffc581
feat: harden localization against malicious HTML ( #5703 )
...
- Add a new script that proccess the localization files and verify that
they only contain HTML according to our strictly defined rules.
- This should make adding malicious HTML near-impossible.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5703
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-committed-by: Gusted <postmaster@gusted.xyz>
2024-10-30 15:59:48 +00:00
Codeberg Translate
031451e740
i18n: update of translations from Codeberg Translate ( #5681 )
...
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: artnay <artnay@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Co-authored-by: Benedikt Straub <Nordfriese@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Juno Takano <jutty@users.noreply.translate.codeberg.org>
Co-authored-by: Bálint Gonda <balinteus@gmail.com>
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5681
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
2024-10-30 15:09:27 +00:00
Anbraten
8dc72589ca
Add typescript
2024-10-29 18:15:09 +01:00
forgejo-renovate-action
afbfe5d850
Merge pull request 'Update vitest monorepo to v2.1.4 (forgejo)' ( #5737 ) from renovate/forgejo-vitest-monorepo into forgejo
2024-10-29 10:36:29 +00:00
Renovate Bot
76ed17453e
Update vitest monorepo to v2.1.4
2024-10-29 10:03:46 +00:00
Earl Warren
485db0a3ba
Merge pull request '[gitea] week 2024-44 cherry pick (gitea/main -> forgejo)' ( #5714 ) from algernon/wcp/2024-44 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5714
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-29 09:05:27 +00:00
0ko
9d687f1069
feat(ui): link back to one-time code page from scratch code page ( #5712 )
...
Preview:
https://codeberg.org/attachments/b60c5d7c-103b-4227-9b0d-3d765dba2431
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5712
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-10-29 05:31:49 +00:00
JakobDev
75ce0bf06b
Fix test
2024-10-28 17:37:24 +01:00
Earl Warren
457be48362
Merge pull request 'docs: add links to the v7.0.10 & v9.0.1 release notes' ( #5729 ) from earl-warren/forgejo:wip-release-notes into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5729
Reviewed-by: Otto <otto@codeberg.org>
2024-10-28 09:22:43 +00:00
Earl Warren
e8e0fe1fea
docs: add links to the v7.0.10 & v9.0.1 release notes
2024-10-28 09:08:48 +01:00
forgejo-renovate-action
2886a661ac
Merge pull request 'Update renovate to v38.132.3 (forgejo)' ( #5716 ) from renovate/forgejo-renovate into forgejo
2024-10-28 08:01:23 +00:00
Earl Warren
266c08f9af
Merge pull request 'Lock file maintenance (forgejo)' ( #5717 ) from renovate/forgejo-lock-file-maintenance into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5717
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-28 07:22:17 +00:00
Renovate Bot
f9a16f8be0
Update renovate to v38.133.0
2024-10-28 06:26:24 +00:00
Earl Warren
e08664c56e
Merge pull request 'use constant time check for internal token' ( #5719 ) from earl-warren/forgejo:wip-timing into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5719
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-10-28 06:14:36 +00:00
Gusted
53231bad61
fix(sec): use constant time check for internal token
2024-10-28 06:25:52 +01:00
Earl Warren
520584bccb
Merge pull request 'add permission check to 'delete branch after merge'' ( #5718 ) from earl-warren/forgejo:wip-delete-branch into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5718
2024-10-28 05:24:13 +00:00
Gusted
266e0b2ce9
security: add permission check to 'delete branch after merge'
...
- Add a permission check that the doer has write permissions to the head
repository if the the 'delete branch after merge' is enabled when
merging a pull request.
- Unify the checks in the web and API router to `DeleteBranchAfterMerge`.
- Added integration tests.
2024-10-28 05:48:10 +01:00
Renovate Bot
492c667a6f
Lock file maintenance
2024-10-28 00:06:32 +00:00
Gergely Nagy
83e4139d41
chore(release-notes): notes for the week 2024-44 weekly cherry pick
2024-10-27 11:27:40 +01:00
Lunny Xiao
480d565944
Fix disable 2fa bug ( #32320 )
...
(cherry picked from commit 2abdbe88b5d16dcb345d27b73f1d9738f2d826dd)
2024-10-27 11:27:40 +01:00
Lunny Xiao
261c0a95b4
Add warn log when deleting inactive users ( #32318 )
...
Add log for the problem #31480
(cherry picked from commit a264c46fb04112c5ec2c1b2acd523a2e4450da40)
Conflicts:
- services/user/user.go
Resolved by manually adding the log line.
2024-10-27 11:27:40 +01:00