1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-26 13:29:12 -05:00
Commit graph

22043 commits

Author SHA1 Message Date
0ko
5f685bf069 Merge pull request 'Allow changing default branch update style' (#6265) from george.bartolomey/forgejo:1-respect-update-branch-method into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6265
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-24 05:08:01 +00:00
George Bartolomey
13ca6c14f1
feat: allow changing default branch update style
This commit allows chaning default branch update style through global
and repository settings. The setting affects "Update branch" button
in PR view (button shows when some commits are ahead of master branch).
When default update style is set to "rebase", dropdown button updates branch
by rebase by default. When update style is set to other value, dropdown button
updates branch by merge. Any of these actions may be selected using dropdown
in any case.

Signed-off-by: George Bartolomey <george@bh4.ru>
2024-12-23 18:55:25 +03:00
Earl Warren
0bebecc968 Merge pull request 'Update module google.golang.org/grpc to v1.69.2 (forgejo)' (#6322) from renovate/forgejo-google.golang.org-grpc-1.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6322
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-12-23 10:56:21 +00:00
Renovate Bot
20b9cbf5df Update module google.golang.org/grpc to v1.69.2 2024-12-23 08:03:41 +00:00
Earl Warren
e266d809e1 Merge pull request 'Update module github.com/go-testfixtures/testfixtures/v3 to v3.14.0 (forgejo)' (#6348) from renovate/forgejo-github.com-go-testfixtures-testfixtures-v3-3.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6348
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-12-23 07:07:34 +00:00
Renovate Bot
0c0a1c0fd5 Update renovate Docker tag to v39.82.0 (forgejo) (#6347)
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
2024-12-23 06:38:24 +00:00
Earl Warren
81e50e0bf5
Update module github.com/go-testfixtures/testfixtures/v3 to v3.14.0 (license) 2024-12-23 07:36:18 +01:00
Gusted
b76f1175c5 Merge pull request 'Lock file maintenance (forgejo)' (#6349) from renovate/forgejo-lock-file-maintenance into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6349
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-23 06:16:04 +00:00
Renovate Bot
2132759889 Lock file maintenance 2024-12-23 02:04:47 +00:00
Renovate Bot
f4d621ca6e Update module github.com/go-testfixtures/testfixtures/v3 to v3.14.0 2024-12-23 00:05:04 +00:00
Gusted
1597e46fe8 Merge pull request 'fix: repo avatar generating (#6338)' (#6339) from Snoweuph/forgejo:fix/repo-avatar into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6339
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-22 19:52:19 +00:00
Snoweuph
be076c98d4
fix: repo avatar generating (#6338) 2024-12-22 18:18:37 +01:00
0ko
4e820ff795 feat(ui): show repo size on mobile (#6344)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6344
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-22 17:05:27 +00:00
Gusted
54255688f5 Merge pull request 'fix: template config path (#2836)' (#6335) from Snoweuph/forgejo:fix/template-file into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6335
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-22 14:53:16 +00:00
Shiny Nematoda
ee214cb886 feat: filepath filter for code search (#6143)
Added support for searching content in a specific directory or file.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6143
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
Co-committed-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
2024-12-22 12:24:29 +00:00
Snoweuph
fcb98c6d3c
fix: template config path (#2836) 2024-12-22 11:05:24 +01:00
0ko
bb88e1daf8 Merge pull request 'Don't notify when a user self-request as reviewer' (#6287) from gabrielgio/forgejo:bug/5567_irrelevant_notification into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6287
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-22 06:10:55 +00:00
Gusted
1e7b922e44 Merge pull request 'fix: keep commit count limit in file history pagination static and not increase with every page' (#6337) from emilylange/fix-file-history-commit-pagination-limit into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6337
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-22 00:02:38 +00:00
emilylange
cd2c1361c5
fix: keep commit count limit in file history pagination static and not increase with every page
This fixes a regression introduced by 58a4407acb
from 2022 which reintroduced passing `--skip` to `git rev-list` in favor
of the custom skipping reader based on `io.CopyN` from 59d1cc49f1
and then forgetting to also revert the
`--max-count=CommitsRangeSize*Page` math.

Before this commit:

~~~bash
# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=1" | jq length
50

# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=2" | jq length
100

# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=10" | jq length
500
~~~

With this commit applied:

~~~bash
# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=1" | jq length
50

# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=2" | jq length
50

# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=10" | jq length
50
~~~
2024-12-21 23:46:29 +01:00
Gabriel A. Giovanini
d7fa527605 test: Test notification count for self review
This tests the case where the user adds itself as reviewer and it
shouldn't get a notification.
2024-12-21 20:03:36 +01:00
Gabriel A. Giovanini
b698b256f1 fix: Ignore self review request notification
A notification would be trigger if a user request itself as review of a
PR.
2024-12-21 20:03:36 +01:00
Gusted
5b542d6c79 Merge pull request 'fix: maven package where actual pom has no group-id defined, fallback to parent group-id' (#6329) from JSchlarb/forgejo:forgejo into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6329
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-21 15:46:58 +00:00
Julian Schlarb
b15352ceb0 fix: maven fallback to parent groupId 2024-12-21 11:48:09 +01:00
Earl Warren
248977c518 Merge pull request 'Update dependency forgejo-lxc to v12 (forgejo)' (#6210) from renovate/forgejo-forgejo-lxc-12.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6210
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-12-21 08:30:27 +00:00
Renovate Bot
c1898c745e Update dependency forgejo-lxc to v12 2024-12-21 04:03:00 +00:00
Gusted
2102163f2f Merge pull request 'chore: avoid using gock' (#6311) from gusted/forgejo-gock into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6311
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-20 21:15:11 +00:00
Codeberg Translate
26797a868b i18n: update of translations from Codeberg Translate (#6242)
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: Benedikt Straub <benedikt-straub@web.de>
Co-authored-by: Edgarsons <Edgarsons@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: xtex <xtexchooser@duck.com>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: artnay <artnay@users.noreply.translate.codeberg.org>
Co-authored-by: Nirei <Nirei@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Juno Takano <jutty@users.noreply.translate.codeberg.org>
Co-authored-by: Anonymous <anonymous@users.noreply.translate.codeberg.org>
Co-authored-by: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6242
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-12-20 16:30:05 +00:00
Earl Warren
6a978972df Merge pull request 'fix: actions move to data.forgejo.org' (#6313) from earl-warren/forgejo:wip-data into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6313
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-20 10:45:18 +00:00
Earl Warren
9cc9ea8d40 Merge pull request 'branding: update contrib/legal' (#6330) from 0ko/forgejo:branding-legal into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6330
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-12-20 07:08:19 +00:00
0ko
424cc169bb branding: update contrib/legal 2024-12-19 18:55:20 +05:00
Renovate Bot
456d059982 Update dependency @playwright/test to v1.49.1 (forgejo) (#6308)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6308
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
2024-12-19 11:20:42 +00:00
Renovate Bot
a941b878ea Update dependency katex to v0.16.18 (forgejo) (#6319)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6319
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
2024-12-19 10:32:24 +00:00
Earl Warren
d07c5cf69c
fix: actions move to data.forgejo.org
code.forgejo.org is meant for development, the actions need to be
highly available and can be read-only. This is what data.forgejo.org
will provide.
2024-12-19 10:55:05 +01:00
Earl Warren
06dac2b448 Merge pull request 'Update actions/cascading-pr action to v2.2.0 (forgejo)' (#6320) from renovate/forgejo-actions-cascading-pr-2.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6320
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-12-19 08:54:00 +00:00
Earl Warren
743cea91c1 Merge pull request 'chore(release): link to the standalone release notes file' (#6324) from earl-warren/forgejo:wip-publish into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6324
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-19 08:30:35 +00:00
Earl Warren
0e02397915
chore(release): link to the standalone release notes file 2024-12-19 09:18:42 +01:00
Renovate Bot
e06ca8cf59 Update actions/cascading-pr action to v2.2.0 2024-12-19 08:03:44 +00:00
Earl Warren
380e266440 Merge pull request '[gitea] week 2024-51 cherry pick (gitea/main -> forgejo)' (#6271) from earl-warren/wcp/2024-51 into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6271
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-19 07:08:01 +00:00
Renovate Bot
9ebef52038 Update dependency globals to v15.14.0 (forgejo) (#6321)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6321
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
2024-12-19 06:42:06 +00:00
Michael Kriese
bbfc63a621 Merge pull request 'Update module golang.org/x/net to v0.33.0 (forgejo)' (#6316) from renovate/forgejo-golang.org-x-net-0.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6316
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-19 06:00:19 +00:00
Renovate Bot
3d55c2976a Update module golang.org/x/net to v0.33.0 2024-12-18 23:14:16 +00:00
0ko
cb2e9fb1f4 i18n(en): some improvements (#6288)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6288
Reviewed-by: Otto <otto@codeberg.org>
2024-12-18 11:30:06 +00:00
Earl Warren
729c18bd54 Merge pull request 'Replace actions/cascading-pr action with actions/cascading-pr v2.1.1 (forgejo)' (#6301) from renovate/forgejo-actions-cascading-pr-replacement into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6301
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-18 09:57:20 +00:00
Earl Warren
e59bf129e0 Merge pull request 'Update forgejo/forgejo-build-publish action to v5.2.1 (forgejo)' (#6264) from renovate/forgejo-forgejo-forgejo-build-publish-5.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6264
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-18 09:49:39 +00:00
viceice
f87c9ee73e ci: use full action url
Signed-off-by: viceice <michael.kriese@gmx.de>
2024-12-18 07:46:12 +00:00
Renovate Bot
516c42892f Replace actions/cascading-pr action with actions/cascading-pr v2.1.1 2024-12-18 07:46:12 +00:00
Earl Warren
dc86771502 Merge pull request 'Update actions/setup-forgejo action to v2 (forgejo)' (#6298) from renovate/forgejo-actions-setup-forgejo-2.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6298
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-12-18 06:58:32 +00:00
Gusted
c26c60ccd1
chore: avoid using gock
- Avoid using gock to do HTTP mocking, this is fairly simply to do
ourselves and avoids a dependency, this commit does right that.
2024-12-18 06:40:02 +01:00
Gusted
4d335c25bf Merge pull request 'Update dependency katex to v0.16.17 (forgejo)' (#6304) from renovate/forgejo-katex-0.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6304
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-18 04:57:37 +00:00
Gusted
3991d76013 Merge pull request 'Update dependency markdownlint-cli to v0.43.0 (forgejo)' (#6309) from renovate/forgejo-markdownlint-cli-0.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6309
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-18 04:57:23 +00:00