19621 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Earl Warren	507c0143ee	Merge pull request 'Update air package URL' (#4011) from 0ko/forgejo:fix-air into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4011 Reviewed-by: Michael Kriese <michael.kriese@gmx.de> Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-06-04 07:30:51 +00:00
0ko	fff9283ca4	Update air package URL	2024-06-04 11:52:58 +05:00
0ko	6672cf0812	Fix org view on mobile for members (#3949) ... The row of buttons on the org view is pretty bad on mobile, as it doesn't leave enough space for the org name. My recent PR 3642 made it worse. I added a mitigation to allow buttons to go to an other row, so that the layout is usable on mobile. It is still non-ideal as it will continue going out of bounds on small screens, but is much better. ## Preview [Old preview](/attachments/1e280a77-533c-41b5-954d-b336f1b72186)  Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3949 Reviewed-by: Otto <otto@codeberg.org> Reviewed-by: Beowulf <beowulf@noreply.codeberg.org>	2024-06-04 04:08:54 +00:00
Earl Warren	c2f1d55c0e	Merge pull request 'docs(release): catch up on release notes' (#4003) from earl-warren/forgejo:wip-release-notes-v8.0 into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4003 Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org> Reviewed-by: Victoria <efertone@noreply.codeberg.org>	2024-06-03 08:15:59 +00:00
Earl Warren	446ab058e3	Merge pull request 'chore(dependency): renovate is used for managing updates' (#4002) from earl-warren/forgejo:wip-js-udpate into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4002 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>	2024-06-03 07:14:39 +00:00
Earl Warren	1571052a74	[skip ci] docs(release): week 2024-21-v7.0 cherry pick ... Refs: https://codeberg.org/forgejo/forgejo/pulls/3859	2024-06-03 09:12:49 +02:00
Earl Warren	eee908d02c	[skip ci] docs(release): week 2024-21 cherry pick ... Refs: https://codeberg.org/forgejo/forgejo/pulls/3838	2024-06-03 09:11:17 +02:00
Earl Warren	d43ce30663	[skip ci] docs(release): week 2024-22 cherry pick ... Refs: https://codeberg.org/forgejo/forgejo/pulls/3917	2024-06-03 08:24:21 +02:00
Earl Warren	dcc9a1ae15	Merge pull request 'Update ghcr.io/visualon/renovate Docker tag to v37.385.0' (#3966) from renovate/ghcr.io-visualon-renovate-37.x into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3966 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-06-03 05:30:08 +00:00
Earl Warren	e9ee514c9a	chore(dependency): renovate is used for managing updates ... Remove https://github.com/silverwind/updates as a dependency	2024-06-03 07:21:19 +02:00
Renovate Bot	87b4a169ca	Update ghcr.io/visualon/renovate Docker tag to v37.385.0	2024-06-02 22:06:00 +00:00
Earl Warren	0bf83db41b	Merge pull request 'Update dependency @github/text-expander-element to v2.7.1' (#3939) from renovate/github-text-expander-element-2.x into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3939 Reviewed-by: Otto <otto@codeberg.org>	2024-06-02 21:36:31 +00:00
Earl Warren	bbdba70db6	Merge pull request 'fix(hook): repo admins are wrongly denied the right to force merge' (#3976) from earl-warren/forgejo:wip-admin-protection into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3976 Reviewed-by: Victoria <efertone@noreply.codeberg.org>	2024-06-02 19:48:44 +00:00
Earl Warren	09f3518069	fix(hook): repo admins are wrongly denied the right to force merge ... The right to force merge is uses the wrong predicate and applies to instance admins: ctx.user.IsAdmin It must apply to repository admins and use the following predicate: ctx.userPerm.IsAdmin() This regression is from the ApplyToAdmins implementation in 79b7089360. Fixes: https://codeberg.org/forgejo/forgejo/issues/3780	2024-06-02 21:16:46 +02:00
Earl Warren	b1c16a673d	Merge pull request 'Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.59.0' (#3971) from renovate/github.com-golangci-golangci-lint-cmd-golangci-lint-1.x into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3971 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-06-02 16:24:19 +00:00
Earl Warren	36ae4ae70e	Merge pull request 'add missed return in POST /repos/{owner}/{repo}/push_mirrors' (#3945) from earl-warren/forgejo:wip-missed-return into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3945 Reviewed-by: Victoria <efertone@noreply.codeberg.org>	2024-06-02 15:43:51 +00:00
Earl Warren	166bb2861f	tests(api): POST /repos/{owner}/{repo}/push_mirrors coverage	2024-06-02 16:31:41 +02:00
Earl Warren	5747951cc7	test(mock): DeletePushMirrors & AddPushMirrorRemote ... make them into variables that can be mocked	2024-06-02 16:31:41 +02:00
Lunny Xiao	ba37b9e577	Add missed return after ctx.ServerError (#31130) (partial) ... Only routers/api/v1/repo/mirror.go (cherry picked from commit b6f15c7948ac3d09977350de83ec91d5789ea083)	2024-06-02 16:31:41 +02:00
Earl Warren	16e8dfe417	Merge pull request 'test(util): MockProtect when mocking multiple times' (#3959) from earl-warren/forgejo:wip-mock-protect into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3959 Reviewed-by: Mai-Lapyst <mai-lapyst@noreply.codeberg.org> Reviewed-by: Victoria <efertone@noreply.codeberg.org>	2024-06-02 14:27:35 +00:00
Earl Warren	884b3c0f4b	test(util): MockProtect when mocking multiple times ... It is fine to use MockVariableValue to change a setting such as: defer test.MockVariableValue(&setting.Mirror.Enabled, true)() But when testing for errors and mocking a function, multiple variants of the functions will be used, not just one. MockProtect a function will make sure that when the test fails it always restores a sane version of the function. For instance: defer test.MockProtect(&mirror_service.AddPushMirrorRemote)() mirror_service.AddPushMirrorRemote = mockOne do some tests that may fail mirror_service.AddPushMirrorRemote = mockTwo do more tests that may fail	2024-06-02 15:24:06 +02:00
0ko	c7f01c9bbd	Refactor install page hints (#3961) ... - rewrite a lot of hints on install page - make sure checkboxes don't hide useful information behind hover This is good for compactness but makes first-time installation more painful than it should be. BTW, this was inherited from Gogs. - update related translation keys (will require Weblate sync to merge) - make sure string locations in en-US.ini make sense. Unfortunately, makes viewing changes harder, but I've attached screenshots ## Preview  Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3961 Reviewed-by: Otto <otto@codeberg.org>	2024-06-02 13:06:56 +00:00
Codeberg Translate	ebabb96ce0	[I18N] Translations update from Weblate (#3908) ... Translations update from [Weblate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: wintryexit <weatherdowner@proton.me> Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org> Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Atalanttore <Atalanttore@users.noreply.translate.codeberg.org> Co-authored-by: kdh8219 <kdh8219@monamo.dev> Co-authored-by: Kaede Fujisaki <ledyba@users.noreply.translate.codeberg.org> Co-authored-by: purkwiat <purkwiat@gmail.com> Co-authored-by: KaKi87 <KaKi87@users.noreply.translate.codeberg.org> Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com> Co-authored-by: gitcookie-1 <gitcookie-1@users.noreply.translate.codeberg.org> Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org> Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3908 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-06-02 12:01:06 +00:00
Earl Warren	319af78171	Merge pull request 'Adding release note for #3337' (#3984) from Mai-Lapyst/forgejo:add-releasenote-3337 into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3984 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-06-02 06:41:20 +00:00
Earl Warren	2c94bbf751	Merge pull request 'Add missing options & values to app.example.ini' (#3983) from Mai-Lapyst/forgejo:cleanup-app-example-ini into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3983 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-06-02 06:39:42 +00:00
Mai-Lapyst	56a6d3f77d	Adding release note for #3337	2024-06-02 06:04:53 +02:00
Mai-Lapyst	c3d60ed9f7	Cleanup & add missing options to app.example.ini	2024-06-02 03:32:36 +02:00
Earl Warren	05f0007437	fix(hook): instance admins wrongly restricted by permissions checks ... This exception existed for both instance admins and repo admins before ApplyToAdmins was introduced in 79b7089360. It should have been kept for instance admins only because they are not subject to permission checks.	2024-06-01 23:50:57 +02:00
Earl Warren	793421bf59	tests(integration): add TestPullMergeBranchProtect ... Verify variations of branch protection that are in play when merging a pull request as: * instance admin * repository admin / owner * user with write permissions on the repository In all cases the result is expected to be the same when merging the pull request via: * API * web Although the implementations are different.	2024-06-01 23:50:57 +02:00
Earl Warren	e0eba21ab7	test(integration): add protected file to doBranchProtect ... A protected file pushed to a protected branch branch is not allowed.	2024-06-01 23:50:57 +02:00
Earl Warren	0d8478b82e	test(integration): refactor doBranchProtectPRMerge ... * group test cases to clarify their purpose * remove pull request branch protection tests, they are redundant with TestPullMergeBranchProtect	2024-06-01 23:50:57 +02:00
Earl Warren	20591d966e	test(integration): refactor testPullMerge ... * split into testPullMergeForm which can be called directly if the caller wants to specify extra parameters. * testPullMergeForm can expect something different than StatusOK	2024-06-01 23:50:57 +02:00
Earl Warren	49aea9879b	test(integration): refactor doAPIMergePullRequest ... * http.StatusMethodNotAllowed can be expected: only retry if the error message is "Please try again later" * split into doAPIMergePullRequestForm which can be called directly if the caller wants to specify extra parameters.	2024-06-01 23:50:57 +02:00
Earl Warren	70aa294cc1	test(integration): refactor doProtectBranch ... explicitly specify the parameters instead of providing them as arguments so the caller has a more fine grain control over them.	2024-06-01 23:50:57 +02:00
Earl Warren	4c2ed3c35d	test(integration): add t.Helper() to reduce stack polution ... Without the a testify stack is likely to not show the relevant test.	2024-06-01 23:50:57 +02:00
0ko	1084362f7c	CSS improvements around commit status icons (#3948) ... - make sure margins are all consistent and good, elements are not too close or too apart - this also applies to "Show commit body" button - remove unused code. The class `commit-status-link` doesn't exist in templates, nor I could find it on any related pages in case it's generated in runtime ## Preview  Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3948 Reviewed-by: Beowulf <beowulf@noreply.codeberg.org>	2024-06-01 15:20:40 +00:00
Earl Warren	6d712590f1	chore(lint): make golangci-lint to v1.59.0 happy	2024-06-01 16:17:07 +02:00
Renovate Bot	288075c724	Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.59.0	2024-06-01 02:07:47 +00:00
Earl Warren	f887972348	Merge pull request 'forgejo-federated-star: UI to define following repos' (#3886) from meissa/forgejo:forgejo-federated-pr5 into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3886 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-05-31 15:57:17 +00:00
Earl Warren	5e71e0fd4a	Merge pull request 'chore(renovate): use sqlite package cache' (#3958) from viceice/renovate-sqlite into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3958 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-05-31 15:32:02 +00:00
Michael Jerger	8aade372cb	add a release note	2024-05-31 16:28:26 +02:00
Earl Warren	3a469d72a0	Merge pull request 'Update module github.com/go-testfixtures/testfixtures/v3 to v3.11.0' (#3955) from renovate/github.com-go-testfixtures-testfixtures-v3-3.x into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3955 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-05-31 13:51:08 +00:00
Earl Warren	dd4a1aa0d4	chore(dependency): automerge go-testfixtures/testfixtures ... Refs: https://codeberg.org/forgejo/forgejo/pulls/3955	2024-05-31 15:10:49 +02:00
Michael Kriese	629554f8a8	chore(renovate): use sqlite package cache	2024-05-31 13:54:12 +02:00
Earl Warren	a1ef8eaf29	Merge pull request 'Disable self-registration by default on the install page' (#3934) from algernon/forgejo:abandon-all-registration-all-ye-who-enter-here into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3934 Reviewed-by: 0ko <0ko@noreply.codeberg.org>	2024-05-31 11:49:20 +00:00
Earl Warren	05c55e53a8	Merge pull request 'Update linters' (#3921) from renovate/linters into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3921 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: Michael Kriese <michael.kriese@gmx.de>	2024-05-31 10:39:01 +00:00
forgejo-renovate-action	494ef1a78a	Merge pull request 'Update ghcr.io/visualon/renovate Docker tag to v37.382.4' (#3957) from renovate/ghcr.io-visualon-renovate-37.x into forgejo	2024-05-31 10:33:50 +00:00
Renovate Bot	1a6fb16166	Update ghcr.io/visualon/renovate Docker tag to v37.382.4	2024-05-31 09:09:22 +00:00
Renovate Bot	430183fa14	Update linters	2024-05-31 08:55:12 +00:00
Earl Warren	dcc842dfeb	Merge pull request 'chore(renovate): disallow eslint-plugin-no-use-extend-native v0.6.0+, requires eslint v9' (#3951) from viceice/forgejo:chore/renovate/update-config into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3951 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-05-31 08:36:38 +00:00