b208b368d8
Merge pull request 'fix(cli): add missing quote in storage help' ( #3893 ) from earl-warren/forgejo:wip-cli-typo into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3893
Reviewed-by: Victoria <efertone@noreply.codeberg.org>
2024-05-25 07:46:22 +00:00
8153dafc73
Merge pull request 'feat(release): fetch OCI alpine images from code.forgejo.org/oci' ( #3892 ) from earl-warren/forgejo:wip-alpine into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3892
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-05-25 07:45:37 +00:00
c7711dac6d
chore: fix typos identified by mispell
2024-05-25 09:43:50 +02:00
041932ed01
feat(release): fetch OCI alpine images from code.forgejo.org/oci
...
Use code.forgejo.org/oci instead of docker.io
so that builds are not subject to rate-limiting when debugging.
The mirrored images are updated daily
https://code.forgejo.org/forgejo/oci-mirror/src/branch/main/.forgejo/workflows/mirror.yml
2024-05-25 08:55:31 +02:00
8c3c68e613
Merge pull request 'Update code.forgejo.org/oci/alpine Docker tag to v3.20' ( #3897 ) from renovate/code.forgejo.org-oci-alpine-3.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3897
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-25 06:34:06 +00:00
98be7826a3
chore(dependency): pin redis to 7.2 for testing
...
There is no need to pin a specific patch version for testing. The
worst that can happen in this context is that the CI fails and it can
be addressed in this context. It will not impact releases.
2024-05-25 08:25:51 +02:00
534f88dd9a
Merge pull request 'Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.58.2' ( #3895 ) from renovate/github.com-golangci-golangci-lint-cmd-golangci-lint-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3895
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-25 06:17:21 +00:00
5d5ac041cd
Update dependency codespell to v2.3.0
2024-05-25 02:07:08 +00:00
3b0501e69f
Update code.forgejo.org/oci/alpine Docker tag to v3.20
2024-05-25 02:05:40 +00:00
237362ddd3
Update redis Docker tag to v7.2.5
2024-05-25 00:05:17 +00:00
5f0380cefb
Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.58.2
2024-05-25 00:05:01 +00:00
84bc4662c2
fix(cli): add missing quote in storage help
2024-05-25 00:32:36 +02:00
b478bfb3cf
Merge pull request 'Update dependency @github/text-expander-element to v2.7.0' ( #3807 ) from renovate/github-text-expander-element-2.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3807
Reviewed-by: Mai-Lapyst <mai-lapyst@noreply.codeberg.org>
2024-05-24 17:34:21 +00:00
da12320a0c
Replace imgage diff png background pattern with gradient ( #3870 )
...
Made the checkerboard background be more flexible in terms of scale and coloring. Provides dark theme for image diff.
I suppose these colors should not be re-used for a color-picker for a example, because it's usually more convenient to always have it in the light mode.
## Test
* go to e6d3623c7ehttps://next.forgejo.org/image-test/image-diff to your local instance
## Before/after
(Old any - New Forgejo dark - New Gitea dark - New Forgejo/Gitea light)
---
Gradient property is taken from [here](https://www.reddit.com/r/css/comments/u08pf3/how_to_make_a_checkerboard_using_background/ ).
[CSS compatibility](https://developer.mozilla.org/en-US/docs/Web/CSS/gradient/conic-gradient#browser_compatibility ): about four years of browser versions.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3870
Reviewed-by: Mai-Lapyst <mai-lapyst@noreply.codeberg.org>
2024-05-24 17:33:13 +00:00
f6c1fd76f2
Fix long branch name overflows ( https://github.com/go-gitea/gitea/pull/30345 )
...
Fixes: https://github.com/go-gitea/gitea/issues/27971
Fixes: https://github.com/go-gitea/gitea/pull/28010
<img width="689" alt="Screenshot 2024-04-09 at 00 19 57"
src="https://github.com/go-gitea/gitea/assets/115237/7c895a47-274f-40a6-a126-290658f1982d ">
Also fixes a similar issue in issue list where CSS was there but not
active because of missing `display: block`.
<img width="372" alt="Screenshot 2024-04-09 at 00 18 25"
src="https://github.com/go-gitea/gitea/assets/115237/cfbee7cd-2e15-4ac7-96ce-020816f48798 ">
---
Little conflict in branch_selector_field (repo.pulls.no_results is renamed in Gitea)
And some weird conflict on new CSS rules added.
2024-05-24 22:11:37 +05:00
509a077ec0
Merge pull request 'mysql: faster user deletion (hook_task query) for mariadb 10' ( #3865 ) from oliverpool/forgejo:join_delete_hook_task into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3865
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-24 12:44:03 +00:00
5fa2d8f5ca
Merge pull request 'Fix expand diff in pull requests being 404 (port of gitea#31013)' ( #3885 ) from algernon/forgejo:gitea/port/31013 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3885
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-24 12:42:19 +00:00
9705d42e02
lint
2024-05-24 13:38:43 +02:00
82cb9e0203
ui for adding following repos
2024-05-24 13:28:15 +02:00
4ffda656e8
mysql: use inner join for hook_task deletion
...
Attempt to fix #3678
2024-05-24 10:31:41 +02:00
bb165fadf6
test: check hook_task deletion
...
move test to integration to ensure Sqlite + MySQL testing
2024-05-24 10:31:41 +02:00
fd9ee1901b
tests: Add a test for code expansion on PRs
...
This adds a new test case to `TestCompareCodeExpand` to exercise the
case where we're viewing a PR's diff.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-05-24 10:30:38 +02:00
a62a887649
Fix incorrect "blob excerpt" link when comparing files ( #31013 )
...
When comparing files between the base repo and forked repo, the "blob
excerpt" link should point to the forked repo, because the commit
doesn't exist in base repo.
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit f48cc501c46a2d34eb701561f01d888d689d60d5)
Conflicts:
- templates/repo/diff/section_split.tmpl
- templates/repo/diff/section_unified.tmpl
Resolved the conflict by picking Gitea's change over ours, and
porting it.
- tests/integration/compare_test.go
Kept our test, but picked the "compare all of the relevant
links" part of the Gitea test.
2024-05-24 10:08:24 +02:00
7c5a755602
Merge pull request 'Update dependency postcss-nesting to v12.1.5' ( #3882 ) from renovate/postcss-packages into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3882
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-05-24 08:01:37 +00:00
95ae3a3c7e
Update dependency postcss-nesting to v12.1.5
2024-05-24 02:04:27 +00:00
eea841d25d
Merge pull request 'Update dependency @playwright/test to v1.44.1' ( #3879 ) from renovate/playwright-monorepo into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3879
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-24 00:43:31 +00:00
b01f3bb2a1
federated-star: finalize receive activity ( #3871 )
...
PR will finalize the ability to receive a federated star from a remote instance.
This is part of: https://codeberg.org/forgejo/forgejo/pulls/1680
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3871
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Michael Jerger <michael.jerger@meissa-gmbh.de>
Co-committed-by: Michael Jerger <michael.jerger@meissa-gmbh.de>
2024-05-24 00:25:57 +00:00
32222d7d0a
Merge pull request '[BUG] Fix SourceHut Builds webhook with triggers field' ( #3864 ) from oliverpool/forgejo:sourcehut_trigger into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3864
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-24 00:16:22 +00:00
2d245351e5
Update dependency @playwright/test to v1.44.1
2024-05-24 00:04:17 +00:00
8cfe353061
Merge pull request 'Update module github.com/jhillyerd/enmime to v1.2.0' ( #3791 ) from renovate/github.com-jhillyerd-enmime-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3791
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-23 10:21:31 +00:00
3056a2ea2e
Merge pull request 'Update ghcr.io/visualon/renovate Docker tag to v37.374.3' ( #3775 ) from renovate/ghcr.io-visualon-renovate-37.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3775
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-05-23 09:50:14 +00:00
ba6d5ae2af
chore(release-notes): enmime upgrade to v1.2.0
...
Refs: https://codeberg.org/forgejo/forgejo/pulls/3791
2024-05-23 11:44:26 +02:00
adba05bac5
Merge pull request 'Update dependency swagger-ui-dist to v5.17.12' ( #3806 ) from renovate/swagger-ui-dist-5.17.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3806
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-23 09:35:41 +00:00
c66c4d8fd5
Merge pull request 'Update module github.com/markbates/goth to v1.80.0' ( #3808 ) from renovate/github.com-markbates-goth-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3808
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-23 09:26:08 +00:00
f84235166e
chore(release-notes): goth upgrade to v1.80.0
...
Refs: https://codeberg.org/forgejo/forgejo/pulls/3808
2024-05-23 10:55:32 +02:00
f5157085aa
Update ghcr.io/visualon/renovate Docker tag to v37.374.3
2024-05-22 20:06:04 +00:00
0376b5087d
Update dependency swagger-ui-dist to v5.17.12
2024-05-22 16:08:46 +00:00
9c7ff70072
Merge pull request '[skip ci] docs(release-notes): 7.0.3 (take 2)' ( #3868 ) from earl-warren/forgejo:wip-release-notes-v7.0 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3868
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-05-22 15:14:26 +00:00
b2378d6d5f
[skip ci] docs(release-notes): 7.0.3 (take 2)
...
This commit was reverted because it introduces a regression.
Refs: https://codeberg.org/forgejo/forgejo/pulls/3867
2024-05-22 16:48:19 +02:00
d8e21e673d
Merge pull request 'Creation of federated user' ( #3792 ) from meissa/forgejo:forgejo-federated-pr3 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3792
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-22 11:11:42 +00:00
0e479f3502
add release-notes
2024-05-22 12:59:41 +02:00
1f6f909b2e
refactor: sourcehut_builds ignore unused fields
2024-05-22 12:56:51 +02:00
c9f38e2813
fix: sourcehut_builds preserve unused fields
...
Fix #3820
2024-05-22 12:56:51 +02:00
7b47cb43c1
test: sourcehut_builds trigger
2024-05-22 12:56:51 +02:00
0dd00a6023
Merge pull request '[skip ci] docs(release-notes): 7.0.3' ( #3858 ) from earl-warren/forgejo:wip-release-notes-v7.0 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3858
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-05-22 10:38:39 +00:00
1c24e2dec6
Removed test case from integration test which will be added in a later pr
2024-05-22 12:37:52 +02:00
ce0921d0c5
[skip ci] docs(release-notes): 7.0.3
2024-05-22 12:34:50 +02:00
780f176fd9
Merge pull request 'fix(build): generate does not need gomock' ( #3862 ) from earl-warren/forgejo:wip-source-tarbal into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3862
Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-05-22 06:17:32 +00:00
f145617b0f
fix(build): generate does not need gomock
...
* the file generated to by gomock is already in the sources
* add generate-gomock to help with rebuilding the files
Fixes: https://codeberg.org/forgejo/forgejo/issues/3861
2024-05-22 07:41:57 +02:00
7bd8443739
Merge pull request 'test: even more sha256 repositories tests' ( #3856 ) from oliverpool/forgejo:push_create_sha256 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3856
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-21 21:50:37 +00:00
Earl Warren