8a65c4d28d
chore(release-notes): related pull requests workflow fixes
...
(cherry picked from commit f56fc51c74
2024-11-04 14:10:27 +00:00
d624a5edd6
fix: Actions PR workflows must update the commit status
...
When a workflow has
on:
pull_request:
types:
- labeled
- unlabeled
The outcome of the workflow (success or failure) must be associated
with the head sha commit status. Otherwise it cannot be used as a
requirement for merging the pull request (branch protections).
(cherry picked from commit 66c85b7d8b
2024-11-04 14:10:27 +00:00
11f71dcb09
fix: add label to issues and PR labeled/unlabeled events
...
When a workflow has
on:
pull_request:
types:
- labeled
- unlabeled
The payload misses the label field describing the added or removed
label.
The unlabeled event type was also incorrectly mapped to the labeled
event type.
(cherry picked from commit 58e3c1fbdb
2024-11-04 14:10:27 +00:00
7ec30b6ee9
Merge pull request '[v9.0/forgejo] chore(ci): notify the k8s cluster about experimental releases' ( #5807 ) from earl-warren/forgejo:wip-v9.0-next-digest into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5807
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-11-04 13:52:05 +00:00
13a5d9f3af
[v9.0/forgejo] 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
(cherry picked from commit dab156b452
2024-11-04 14:30:53 +01:00
a429dbad98
Merge pull request '[v9.0/forgejo] fix: support `www.github.com` for migrations' ( #5800 ) from bp-v9.0/forgejo-284ffe4 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5800
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-11-03 18:21:04 +00:00
0c0fd333f3
fix: support `www.github.com` for migrations
...
(cherry picked from commit 284ffe4e00
2024-11-03 17:28:30 +00:00
d96cef1ac4
Merge pull request '[v9.0/forgejo] fix: reset `history.scrollRestoration` if set to `manual` and no issue anchor in url' ( #5753 ) from bp-v9.0/forgejo-ec4a0e1 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5753
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-11-01 10:10:25 +00:00
3f58b8d1bd
Merge pull request '[v9.0/forgejo] fix git-grep for code search when git version is below 2.38' ( #5759 ) from earl-warren/forgejo:wip-v9.0-grep into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5759
Reviewed-by: Otto <otto@codeberg.org>
2024-10-31 21:12:18 +00:00
908bd64238
fix(grep): fix git-grep for code search when git version is below 2.38
...
(cherry picked from commit f2ab4ff83a
2024-10-31 21:26:03 +01:00
be36f91bb7
Merge pull request '[v9.0/forgejo] i18n: update of translations from Codeberg Translate' ( #5748 ) from bp-v9.0/forgejo-031451e into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5748
Reviewed-by: Otto <otto@codeberg.org>
2024-10-31 06:38:23 +00:00
8e4536fd98
fix: reset `history.scrollRestoration` if set to `manual` and no issue anchor in url
...
(cherry picked from commit ec4a0e1b6e
2024-10-31 02:37:43 +00:00
f043fb4495
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>
(cherry picked from commit 031451e740
2024-10-30 15:15:39 +00:00
1dc03cc1c3
Merge pull request '[v9.0/forgejo] use constant time check for internal token' ( #5724 ) from bp-v9.0/forgejo-53231ba into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5724
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-28 08:03:48 +00:00
e4dac6a6ab
Merge pull request '[v9.0/forgejo] add permission check to 'delete branch after merge'' ( #5721 ) from bp-v9.0/forgejo-266e0b2 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5721
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-28 07:24:05 +00:00
ff585d0a20
Merge pull request '[gitea] week 2024-44-v9.0 cherry pick (gitea/main -> v9.0/forgejo)' ( #5715 ) from earl-warren/wcp/2024-44-v9.0 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5715
2024-10-28 06:59:58 +00:00
5f9a2ad1db
fix(sec): use constant time check for internal token
...
(cherry picked from commit 53231bad61
2024-10-28 06:17:25 +00:00
618eb8e72a
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.
(cherry picked from commit 266e0b2ce9
2024-10-28 06:04:45 +00:00
d763886dae
chore(release-notes): notes for the week 2024-44-v9.0 weekly cherry pick
2024-10-27 12:05:14 +01:00
768402c884
Fix disable 2fa bug ( #32320 )
...
(cherry picked from commit 2abdbe88b5d16dcb345d27b73f1d9738f2d826dd)
2024-10-27 11:57:08 +01:00
9c6f2a132d
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:54:36 +01:00
d77096071d
Merge pull request '[v9.0/forgejo] fix: use buffered iterate for debian searchpackages' ( #5710 ) from bp-v9.0/forgejo-459ab11 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5710
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-10-27 01:17:59 +00:00
f0abba3eef
fix: use buffered iterate for debian searchpackages
...
- The driver being used for PostgreSQL doesn't handle interleaved
queries (you start a query, read some rows and start another query while
you didn't finish that query yet), this is the case with using
`.Iterate` from XORM.
- Switch to a variant of what exist in the current codebase of
`db.Iterate`, which is a simple buffered iteration and doesn't keep
queries open, which allow other database operations to happen.
- Unit test added. This doesn't cover that postgres does not error on
this case, as this is not run with a postgres database.
- Resolves #5696
(cherry picked from commit 459ab11a8a
2024-10-27 00:10:02 +00:00
5d211c101f
Merge pull request '[v9.0/forgejo] Fix boolean inputs in workflow_dispatch' ( #5708 ) from bp-v9.0/forgejo-96c4ca2 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5708
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-26 06:42:18 +00:00
01e9ac0561
Fix boolean inputs in workflow_dispatch; closes #5425
...
(cherry picked from commit 96c4ca249a
2024-10-26 06:00:50 +00:00
a4e5b1b6bc
Merge pull request '[v9.0/forgejo] fix: make branch protection work for new branches' ( #5691 ) from bp-v9.0/forgejo-f5e0259 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5691
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-24 21:09:50 +00:00
1f62fe8ae0
fix: make branch protection work for new branches
...
- If `GetAffectedFiles` is called for a push with an empty oldCommitID,
then set the oldCommitID to the empty tree. This will effictively diff
all the changes included in the push, which is the expected behavior for
branches.
- Integration test added.
- Resolves #5683
- Port of gitea#31778 but implemented differently.
(cherry picked from commit f5e025917f
2024-10-24 20:21:43 +00:00
96f0c76648
Merge pull request '[v9.0/forgejo] i18n: update of translations from Codeberg Translate' ( #5680 ) from bp-v9.0/forgejo-f72567e into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5680
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-24 05:21:03 +00:00
e37a344ce5
i18n: update of translations from Codeberg Translate ( #5583 )
...
Co-authored-by: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Co-authored-by: eldyj <eldyj@users.noreply.translate.codeberg.org>
Co-authored-by: Benedikt Straub <Nordfriese@users.noreply.translate.codeberg.org>
Co-authored-by: tkbremnes <tkbremnes@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: meskobalazs <meskobalazs@users.noreply.translate.codeberg.org>
Co-authored-by: div72 <div72@users.noreply.translate.codeberg.org>
Co-authored-by: xtex <xtexchooser@duck.com>
Co-authored-by: kmpm <kmpm@users.noreply.translate.codeberg.org>
Co-authored-by: Fnurkla <Fnurkla@users.noreply.translate.codeberg.org>
Co-authored-by: Juno Takano <jutty@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: buhtz <buhtz@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Co-authored-by: Atul_Eterno <Atul_Eterno@users.noreply.translate.codeberg.org>
Co-authored-by: artnay <artnay@users.noreply.translate.codeberg.org>
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5583
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
(cherry picked from commit f72567ee14
2024-10-24 04:39:43 +00:00
887a9576b8
Merge pull request '[v9.0/forgejo] link to security policy in security.txt' ( #5656 ) from bp-v9.0/forgejo-d06f1c6 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5656
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-22 18:05:09 +00:00
edd468323f
Merge pull request '[v9.0/forgejo] fix: don't show truncated comments in RSS/Atom feeds' ( #5655 ) from bp-v9.0/forgejo-f4a7132 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5655
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-10-22 17:45:54 +00:00
4b7f369290
link to security policy in security.txt
...
(cherry picked from commit d06f1c6856
2024-10-22 16:51:21 +00:00
ef8f366734
fix: don't show truncated comments in RSS/Atom feeds
...
- When a truncated comment is detected in the RSS/Atom feeds, fetch the
comment from the database and use the original content.
- Added integration test.
- Resolves #5650
(cherry picked from commit f4a7132a89
2024-10-22 16:50:57 +00:00
c5e4694327
Merge pull request '[gitea] week 2024-43-v9.0 cherry pick (gitea/main -> v9.0/forgejo)' ( #5647 ) from earl-warren/wcp/2024-43-v9.0 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5647
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-10-22 16:47:01 +00:00
9471083571
Merge pull request '[v9.0/forgejo] fix: typo on releases for source code downloads' ( #5654 ) from bp-v9.0/forgejo-02f8fad into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5654
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-10-22 15:22:50 +00:00
804051b9dd
fix: typo on releases for source code downloads
...
Closes #5648
(cherry picked from commit 02f8fad54d
2024-10-22 14:03:42 +00:00
893d0941a8
chore(release-notes): weekly cherry-pick week 2024-43-v9.0
2024-10-22 07:36:59 +02:00
1913399d81
Always update expiration time when creating an artifact ( #32281 )
...
Fix #32256
(cherry picked from commit 9116665e9c1c01d882c919fb3058f7fdb695350e)
2024-10-22 07:28:30 +02:00
4fe311e7c0
Update scheduled tasks even if changes are pushed by "ActionsUser" ( #32246 )
...
Fix #32219
---------
Co-authored-by: delvh <dev.lh@web.de>
(cherry picked from commit 81aec6d621a3ea0dfb02d3b4d20b9be77c30c6ab)
2024-10-22 07:28:30 +02:00
b8ffb88d1d
Merge pull request '[v9.0/forgejo] Revert "add gap between branch dropdown and PR button"' ( #5645 ) from bp-v9.0/forgejo-04e2e15 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5645
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-10-21 22:13:03 +00:00
fd8565c91a
Revert "add gap between branch dropdown and PR button"
...
This change does not bring the desired benefit, because the button is
reinitialized from a Vue component once loaded, overriding this change
and causing a visual glitch upon page load (the button is moving its
position).
See the comment:
> this code must match the code in BranchTagSelector.vue
This button is also used in other places such as the release list where
the additional margin does not fit well. As such, this needs a new
solution.
This reverts commit 18cad9d34204e2e1510d
2024-10-21 20:44:28 +00:00
c87ff7dc1d
Merge pull request '[v9.0/forgejo] package arch database not updating when uploading "any" architecture' ( #5636 ) from bp-v9.0/forgejo-95c7599 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5636
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-10-21 06:04:38 +00:00
7d3d8ef142
Merge pull request '[v9.0/forgejo] specify default value for `EXPLORE_DEFAULT_SORT`.' ( #5629 ) from bp-v9.0/forgejo-f4be4e7 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5629
Reviewed-by: Otto <otto@codeberg.org>
2024-10-21 05:18:20 +00:00
032bb17899
Merge pull request '[v9.0/forgejo] correct SQL query for active issues' ( #5631 ) from bp-v9.0/forgejo-0055fdb into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5631
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-10-21 05:16:13 +00:00
fa307f06ac
fix arch pkg
...
(cherry picked from commit 95c7599db5
2024-10-21 05:10:13 +00:00
d5c6036c53
fix: correct SQL query for active issues
...
- The `OR` should be inside the `AND` condition to not 'bypass' the other
conditions.
- Added minimal unit test.
- Regression from 2675a246490055fdbdc4
2024-10-20 23:31:54 +00:00
f3b16e1363
fix: Specify default value for `EXPLORE_DEFAULT_SORT`.
...
- This is another regression from
5a0bc357995a0bc35799f4be4e733c
2024-10-20 23:07:18 +00:00
240fbc2661
Merge pull request '[v9.0/forgejo] fix: Add `recentupdated` as recognized sort option' ( #5624 ) from bp-v9.0/forgejo-df38c41 into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5624
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-10-20 12:38:24 +00:00
642dd61446
fix: Add `recentupdated` as recognized sort option
...
- Add `recentupdated` to the `OrderByMap`.
- Add integration testing for organization and user repository sorting.
- Resolves #5612
- Regression from 12e23ee1995a0bc35799df38c41c7a
2024-10-20 10:58:07 +00:00
c7e52852bb
Merge pull request '[v9.0/forgejo] fix: Don't double escape delete branch text' ( #5618 ) from bp-v9.0/forgejo-8c8b31f into v9.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5618
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-10-19 22:28:48 +00:00
Earl Warren