21517 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Otto Richter	d06f1c6856	link to security policy in security.txt	2024-10-22 14:28:17 +02:00
Gusted	2626f4ee3b	Merge pull request 'conf: Improve delete_old_actions description' (#5644) from xenrox/forgejo:conf-improvement into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5644 Reviewed-by: Otto <otto@codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-10-22 11:05:38 +00:00
Earl Warren	aa4d098844	chore(license): Update module github.com/prometheus/client_golang to v1.20.5 (forgejo)	2024-10-22 07:48:36 +02:00
Earl Warren	884b21efd5	Merge pull request 'chore(release-notes): no need to specify they are draft' (#5646) from earl-warren/forgejo:wip-rna into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5646 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>	2024-10-22 05:44:12 +00:00
Earl Warren	f586944db3	chore(release-notes): no need to specify they are draft ... Since they are written to the milestone that is still open, there is no risk of confusing them with final release notes. Such a distinction is more relevant when in the context of a release notes file committed to the repository.	2024-10-22 06:54:27 +02:00
Gusted	e45c304b31	Merge pull request 'Revert "add gap between branch dropdown and PR button"' (#5640) from fnetx/dropdown-glitch into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5640 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Reviewed-by: Panagiotis "Ivory" Vasilopoulos <git@n0toose.net>	2024-10-21 20:43:54 +00:00
Thorben Günther	c2f7aca9da	conf: Improve delete_old_actions description ... This matches the text in the web interface. The old description can be easily mistaken for handling "Forgejo Actions".	2024-10-21 22:31:50 +02:00
Gusted	6c0698c7de	Merge pull request 'fix: make syncronize tags to database handle annoted tags' (#5641) from gusted/forgejo-sync-tags into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5641 Reviewed-by: Otto <otto@codeberg.org>	2024-10-21 18:45:21 +00:00
0ko	3e1d5cc447	feat(ui): better activity messages for cases of private profiles (#5638) ... * added a message for the case where the user's profile is private but the Public activity is not hidden The activity is still hidden anyway because the profile is private, but previously the message would say: `Your activity is visible to everyone, except for interactions in private spaces...` which I would consider as a flaw of the original implementation. Now it will say: `Your activity is only visible to you and the instance administrators because your profile is private...` * started showing the message for admins that the activity they see should remain private in the case where the whole profile is private, not just the activity tab. Previously it would say: This activity is visible to everyone, but as an administrator you can also see interactions in private spaces.` which I would also consider as a flaw of the original implementation. Now it will say: `This activity is visible to you because you're an administrator, but the user wants it to remain private.` * added test cases * bumped up the number of our GPL-licensed files Preview For both screenshots, Forgejo would previously display misinformation. Change 1: User viewing their private profile, but activity isn't configured as hidden https://codeberg.org/attachments/6659c80c-15dd-48be-a379-db737fd1dd5e Change 2: Admin viewing user's private profile https://codeberg.org/attachments/220da57f-b658-4474-9ad2-049e8438a0af Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5638 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-10-21 14:39:29 +00:00
Gusted	f298bf125a	Merge pull request 'fix: use ValidateEmail as binding across web forms' (#5158) from solomonv/consolidate-email-validation into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5158 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-10-21 14:31:32 +00:00
Gusted	6da194fae8	fix: make syncronize tags to database handle annoted tags ... - When an admin wants syncronize tags in the Git data to the database via the admin dashboard all annoted tags loses their title. This was caused because the code didn't correctly handle annoted tags. Annoted tags have their own objectID to store the annoted message, unlike 'normal' tags which point to the commitID. While the function was being run for annoted tags, the code thought it found a mismatch in the objectIDs, because the stored version was actually correct which pointed to the commitID but the code found the objectID of the annoted tag. - Make `SyncReleasesWithTags` corectly handle annoted tags. - Added unit and integration tests. - Resolves #5628	2024-10-21 16:21:07 +02:00
Otto Richter	04e2e1510d	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 18cad9d342.	2024-10-21 15:21:44 +02:00
Earl Warren	ea70757fc7	Merge pull request 'feat(ci): allow manual triggering of the test suite' (#5637) from earl-warren/forgejo:wip-testing-dispatch into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5637 Reviewed-by: 0ko <0ko@noreply.codeberg.org>	2024-10-21 06:51:50 +00:00
Earl Warren	e0ea4e2de4	feat(ci): allow manual triggering of the test suite ... When a skip ci label is added to the PR title, removing it won't trigger the CI. There needs to be a way to manually trigger it.	2024-10-21 08:06:22 +02:00
Earl Warren	9519392809	Merge pull request 'Lock file maintenance (forgejo)' (#5633) from renovate/forgejo-lock-file-maintenance into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5633 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-10-21 05:10:58 +00:00
forgejo-renovate-action	da7c28735f	Merge pull request 'Update renovate to v38.128.6 (forgejo)' (#5632) from renovate/forgejo-renovate into forgejo	2024-10-21 05:09:46 +00:00
Earl Warren	cbfb87b329	Merge pull request 'package arch database not updating when uploading "any" architecture' (#5634) from dragon/forgejo:bugfix-arch-noarch into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5634 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-10-21 05:09:13 +00:00
dragon	95c7599db5	fix arch pkg	2024-10-21 10:08:57 +08:00
Renovate Bot	5beb1b56df	Lock file maintenance	2024-10-21 02:05:21 +00:00
Renovate Bot	13762759fd	Update renovate to v38.128.6	2024-10-21 00:03:17 +00:00
Gusted	55c30ba266	Merge pull request 'fix: correct SQL query for active issues' (#5627) from gusted/forgejo-fix-active-issues into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5627 Reviewed-by: Otto <otto@codeberg.org>	2024-10-20 23:30:01 +00:00
Gusted	b5ccb55b58	Merge pull request 'fix(i18n): edit should not be lowercase here' (#5625) from fnetx/tagedit-typo into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5625 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-10-20 23:27:57 +00:00
Otto	69e68897e4	Merge pull request 'fix: Specify default value for EXPLORE_DEFAULT_SORT.' (#5626) from gusted/forgejo-default-sort-value into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5626 Reviewed-by: Otto <otto@codeberg.org>	2024-10-20 23:05:29 +00:00
Gusted	0055fdbdc4	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 2675a24649	2024-10-21 00:48:04 +02:00
Gusted	f4be4e733c	fix: Specify default value for EXPLORE_DEFAULT_SORT. ... - This is another regression from 5a0bc35799, where the default value was changed to "alphabetically" because it relied on `ExploreDefaultSort` providing a fallback value. - Set the default value for `EXPLORE_DEFAULT_SORT` to `recentupdate`, this was already the behavior explicitly for existing users of this setting but with 5a0bc35799 it didn't provide a explicit fallback to `recentupdate`. So opting for a 'easy' fix, that doesn't add boilerplate code to those instances.	2024-10-21 00:11:47 +02:00
Otto Richter	1b6ed6dc5b	fix(i18n): edit should not be lowercase here ... This also propagated to translations and it looks a little odd in the tooltip	2024-10-21 00:11:33 +02:00
Gusted	215700fc83	Merge pull request 'fix: Add recentupdated as recognized sort option' (#5613) from gusted/forgejo-add-recentupdated-case into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5613 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: Otto <otto@codeberg.org>	2024-10-20 10:57:20 +00:00
6543	f4c2c401ec	API: enhance SearchIssues swagger docs (#32208) ... this will result in better api clients generated out of the openapi docs ... for SearchIssues --- *Sponsored by Kithara Software GmbH* (cherry picked from commit d638067d3cb0a7f69b4d899f65b9be4940bd3e41)	2024-10-20 09:44:18 +02:00
Zettat123	f3f386545e	Always update expiration time when creating an artifact (#32281) ... Fix #32256 (cherry picked from commit 9116665e9c1c01d882c919fb3058f7fdb695350e)	2024-10-20 09:43:42 +02:00
cloudchamb3r	c163bf6fb5	Fix null errors on conversation holder (#32258) (#32266) ... fix #32258 Errors in the issue was due to unhandled null check. so i fixed it. ### Detailed description for Issue & Fix To reproduce that issue, the comment must be deleted on Conversation tab. #### Before Delete <img width="1032" alt="image" src="https://github.com/user-attachments/assets/72df61ba-7db6-44c9-bebc-ca1178dd27f1"> #### After Delete (AS-IS) <img width="1010" alt="image" src="https://github.com/user-attachments/assets/36fa537e-4f8e-4535-8d02-e538c50f0dd8"> gitea already have remove logic for `timeline-item-group`, but because of null ref exception the later logic that removes `timeline-item-group` could be not be called correctly. (cherry picked from commit 603fca1e27bc29c1e700cc1bd284eb619d2436c8)	2024-10-20 09:35:34 +02:00
谈笑风生间	c3741d7fb0	Support requested_reviewers data in comment webhook events (#26178) ... close #25833 Currently, the information for "requested_reviewers" is only included in the webhook event for reviews. I would like to suggest adding this information to the webhook event for "PullRequest comment" as well, as they both pertain to the "PullRequest" event. Also, The reviewer information for the Pull Request is not displayed when it is approved or rejected. (cherry picked from commit d50ed0abf731a10741831d4b6dd54791e3e567ec)	2024-10-20 09:34:46 +02:00
a1012112796	3aaf6f72d6	make show stats work when only one file changed (#32244) ... fix https://github.com/go-gitea/gitea/issues/32226 in https://github.com/go-gitea/gitea/pull/27775 , it do some changes to only show diff file tree when more than one file changed. But looks it also break the `diff-file-list` logic, which looks not expected change. so try fix it. /cc @silverwind example view:  Signed-off-by: a1012112796 <1012112796@qq.com> (cherry picked from commit c4b2808b896dd86323c6a0d119c8cf24752d4d8a) Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu> Conflicts: - web_src/js/features/repo-diff-filetree.js web_src/js/features/repo-diff.js Conflicts resolved by manually applying the changes.	2024-10-20 09:29:33 +02:00
Zettat123	e8700cee61	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-20 09:24:58 +02:00
Zettat123	89446e60a6	Support migrating GitHub/GitLab PR draft status (#32242) ... Resolve #32196 (cherry picked from commit 74664b08a004393ce013e872e47901f52645b65a)	2024-10-20 09:24:25 +02:00
Otto	dfe9bdd15f	Merge pull request 'feat: Create temporary user helper function' (#5617) from gusted/forgejo-temp-user-e2e into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5617 Reviewed-by: Otto <otto@codeberg.org>	2024-10-19 22:05:31 +00:00
Gusted	cd7c015dd3	Merge pull request 'mail issue: Display issue type in email header' (#5389) from xenrox/forgejo:mail-issue into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5389 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-10-19 21:54:56 +00:00
Gusted	df38c41c7a	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 12e23ee199 where the `recentupdated` case was not added to the map, but was handled seperately as a fallback. The regression came into affect when 5a0bc35799 also relied on this map but didn't handle the `recentupdated` case.	2024-10-19 23:53:29 +02:00
Gusted	b43d9d5ae6	Merge pull request 'fix: Don't double escape delete branch text' (#5615) from gusted/forgejo-avoid-double-escape into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5615 Reviewed-by: Otto <otto@codeberg.org>	2024-10-19 21:21:33 +00:00
Gusted	0b92d6e0ba	feat: Create temporary user helper function ... - Add a helper function that creates and log into a temporary user. So it doesn't affect other users and tests and the test can more easily be retried with a 'fresh' state instead of a broken state. - Adjust the Webauthn test to make use of this. - Relevant: #5291, #5394	2024-10-19 22:58:32 +02:00
Gusted	8c8b31f304	fix: Don't double escape delete branch text ... - Don't double escape the 'Delete branch "$BRANCH"' text. `Locale.Tr` escapes the argument already and Vue does too by default. - Let Vue escape the text and add a unit test ensuring that it escapes. - Resolves #5582	2024-10-19 22:05:35 +02:00
Thorben Günther	74403d1f0f	mail issue: Display issue type in email header ... Currently notification emails for Pull Requests or Issues are indistinguishable at first glance. This adds the type ("PR" or "Issue") before the index number.	2024-10-19 21:25:54 +02:00
Earl Warren	e2354703ed	Merge pull request '[gitea] week 2024-42 cherry pick (gitea/main -> forgejo)' (#5543) from earl-warren/wcp/2024-42 into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5543 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-10-19 13:54:24 +00:00
Renovate Bot	453b07706a	Update module github.com/prometheus/client_golang to v1.20.5	2024-10-19 12:03:54 +00:00
Gusted	b76d7a2b2d	Merge pull request 'Update code.forgejo.org/go-chi/session digest to 2a99226 (forgejo)' (#5608) from renovate/forgejo-code.forgejo.org-go-chi-session-digest into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5608 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-10-19 11:23:03 +00:00
Renovate Bot	dc5de38db0	Update code.forgejo.org/go-chi/session digest to 2a99226	2024-10-19 00:03:40 +00:00
Earl Warren	182761e407	Merge pull request 'Update module github.com/go-enry/go-enry/v2 to v2.9.1 (forgejo)' (#5601) from renovate/forgejo-github.com-go-enry-go-enry-v2-2.x into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5601 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-10-18 08:40:21 +00:00
Earl Warren	fcd1d3ed66	chore(release-notes): Update module github.com/go-enry/go-enry/v2 to v2.9.1	2024-10-18 10:12:06 +02:00
Renovate Bot	dad18d985a	Update module github.com/go-enry/go-enry/v2 to v2.9.1	2024-10-18 00:05:06 +00:00
Earl Warren	d924d241b0	Merge pull request 'Update github.com/google/pprof digest to a352233 (forgejo)' (#5435) from renovate/forgejo-github.com-google-pprof-digest into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5435 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-10-17 22:33:14 +00:00
Renovate Bot	d01393efd3	Update github.com/google/pprof digest to 017d972	2024-10-17 22:03:13 +00:00