1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-14 11:48:09 -05:00
Commit graph

21697 commits

Author SHA1 Message Date
Gusted
e726b7ec3b Merge pull request '[SKIP CI] Don't duplicate key' (#5115) from gusted/forgejo-translation-unique-key into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5115
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-08-25 16:20:22 +00:00
Gusted
5c2445d643
[SKIP CI] Don't duplicate key
- Follow up #4819.
- It introduces a duplicate key, which is wrong. Move to a unique
translation key to avoid conflicts.
2024-08-25 18:07:22 +02:00
Otto
32735b1e61 Merge pull request '[TESTS] Move CreateDeclarativeRepo to more accessible location' (#5108) from gusted/forgejo-chore-declerative-repo into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5108
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-08-25 11:15:22 +00:00
Gergely Nagy
0aa3e6e4e4
tests: Use require.NoError in tests picked from Gitea
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-08-25 13:02:19 +02:00
Lunny Xiao
ef5ac9a8ee
Use correct function name (#31887)
(cherry picked from commit 0299bb97f038685aee794a992fa4a9f5cf83652e)
2024-08-25 11:56:35 +02:00
william-allspice
79f6f2f62e
Move lock icon position and add additional tooltips to branch list page (#31839)
This Pull Request adds missing tool tips for the protected, copy, and rss icons on the branch list page. It also moved protected icon position after the branch name.

(cherry picked from commit 40036b610224338ff730acb6e182aa8a6ebdb009)
2024-08-25 11:56:35 +02:00
Lunny Xiao
3ade4d9b2b
Don't return 500 if mirror url contains special chars (#31859)
Fix #31640

(cherry picked from commit d158472a5a9ead8052095b153821a9f26c294452)
2024-08-25 11:56:35 +02:00
Lunny Xiao
dda53569b1
Fix agit automerge (#31207)
(cherry picked from commit 8b92eba21f5c5cca277b8101ada0ea7a1fb32ae0)
2024-08-25 10:47:37 +02:00
Rowan Bohde
1b845b2722
add CfTurnstileSitekey context data to all captcha templates (#31874)
In the OpenID flows, the "CfTurnstileSitekey" wasn't populated, which
caused those flows to fail if using Turnstile as the Captcha
implementation.

This adds the missing context variables, allowing Turnstile to be used
in the OpenID flows.

(cherry picked from commit 0d24c9f383255605d68a92cc5f087c3f16a1d735)
2024-08-25 10:47:02 +02:00
Lunny Xiao
bdf477f6ef
Fix actions notify bug (#31866)
Try to fix
https://github.com/go-gitea/gitea/issues/31757#issuecomment-2295131062

(cherry picked from commit 4f5c96627b4622d64593db2d436b1f3befa5f3c3)
2024-08-25 10:41:24 +02:00
Gusted
fc40a5e242
[CHORE] Move to new sessioner library
- Moves to a fork of gitea.com/go-chi/session that removed support for
couchbase (and ledis, but that was never made available in Forgejo)
along with other code improvements.
f8ce677595..main
- The rationale for removing Couchbase is quite simple. Its not licensed
under FOSS
license (https://www.couchbase.com/blog/couchbase-adopts-bsl-license/)
and therefore cannot be tested by Forgejo and shouldn't be supported.
This is a similair vein to the removal of MSSQL
support (https://codeberg.org/forgejo/discussions/issues/122)
- A additional benefit is that this reduces the Forgejo binary by ~600Kb.
2024-08-25 03:47:08 +02:00
Gusted
d34d8ec2cf Merge pull request 'fix: include last line in file previews with no trailing newline' (#5085) from solomonv/fix-previews-without-trailing-eol into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5085
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-25 00:58:14 +00:00
silverwind
98349a1889
[PORT] Enable no-jquery/no-class-state (gitea#31639)
Just 4 validations and I specifically tested this by
selecting/unselecting issue labels.

Co-authored-by: Giteabot <teabot@gitea.io>

---
Clean port. Fixed two additional warnings

(cherry picked from commit 3a7454df7a518f810fbeb34b9d784e7c29d173ff)
2024-08-25 02:57:50 +02:00
Gusted
f78e397dd6
[TESTS] Move CreateDeclarativeRepo to more accessible location
- This allows `CreateDeclarativeRepo` to be used by other testing
packages such as E2EE testing.
- Removes unused function in `services/webhook/sourcehut/builds_test.go`.
2024-08-25 02:54:43 +02:00
Gusted
4f54918381 Merge pull request 'fix(ui): prevent exceptions on other users' repo migration pages' (#4875) from solomonv/forgejo:fix-migration-guest-exception into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4875
Reviewed-by: Caesar Schinas <caesar@caesarschinas.com>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-24 23:49:20 +00:00
Solomon Victorino
8f53a69c2e fix: include last line in file previews with no trailing newline 2024-08-24 17:10:31 -06:00
silverwind
04cd89709c
[PORT] Remove eslint-plugin-jquery (gitea#31402)
- Remove `eslint-plugin-jquery` as `eslint-plugin-no-jquery` does all it
does and is actually the maintained fork of it.

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

---
Modification: Only keep removal of eslint-plugin-jquery

(cherry picked from commit 17baf1af10de025a47ade1f16f1e5c51646d7fcf)
2024-08-25 00:48:47 +02:00
Gusted
78e4736db6 Merge pull request '[BUG] First user created through reverse proxy should be admin' (#4549) from gusted/forgejo-reverseproxy-admin into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4549
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Radosław Piliszek <radek@piliszek.it>
2024-08-24 22:45:32 +00:00
Gusted
1cab8788c8 Merge pull request 'Update dependency eslint-plugin-unicorn to v55 (forgejo)' (#5098) from renovate/forgejo-eslint-plugin-unicorn-55.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5098
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-24 22:40:27 +00:00
Gusted
a611ad3536 Merge pull request 'Update dependency mermaid to v11 (forgejo)' (#5100) from renovate/forgejo-mermaid-11.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5100
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-24 21:34:08 +00:00
Gusted
b061a14e15
[PORT] Unicorn eslint plugins configs
Ported from https://github.com/go-gitea/gitea/pull/31766 &
https://github.com/go-gitea/gitea/pull/31402 & https://github.com/go-gitea/gitea/pull/30840
2024-08-24 22:31:34 +02:00
Renovate Bot
9272425bab
Update dependency eslint-plugin-unicorn to v55 2024-08-24 22:31:33 +02:00
Gusted
4575b58da3
[CHORE] Remove elkjs hack 2024-08-24 22:13:32 +02:00
Renovate Bot
ed29b9e423 Update dependency mermaid to v11 2024-08-24 20:02:22 +00:00
Gusted
a72be741d4 Merge pull request 'Update module github.com/google/go-github/v63 to v64 (forgejo)' (#5101) from renovate/forgejo-github.com-google-go-github-v63-64.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5101
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-24 18:43:11 +00:00
Gusted
696cbde942 Merge pull request 'Update dependency happy-dom to v15 (forgejo)' (#5099) from renovate/forgejo-happy-dom-15.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5099
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-24 17:47:52 +00:00
Gusted
8583ffa598 Merge pull request 'Update dependency eslint-plugin-sonarjs to v2 (forgejo)' (#5097) from renovate/forgejo-eslint-plugin-sonarjs-2.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5097
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-24 17:37:23 +00:00
Gusted
bef1c643b6 Merge pull request 'Update dependency eslint-plugin-github to v5 (forgejo)' (#5096) from renovate/forgejo-eslint-plugin-github-5.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5096
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-24 17:37:08 +00:00
Gusted
5dbacb70f4 Merge pull request 'Allow pushmirror to use publickey authentication' (#4819) from ironmagma/forgejo:publickey-auth-push-mirror into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4819
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-08-24 16:53:56 +00:00
Gusted
931a6f16dc
[CHORE] Fix go-licenses 2024-08-24 18:34:28 +02:00
Renovate Bot
c111730d08 Update module github.com/google/go-github/v63 to v64 2024-08-24 16:05:36 +00:00
Renovate Bot
cec6b0041a Update dependency happy-dom to v15 2024-08-24 16:04:36 +00:00
Renovate Bot
f0482675dd Update dependency eslint-plugin-sonarjs to v2 2024-08-24 16:04:06 +00:00
Renovate Bot
2129bf04a1 Update dependency eslint-plugin-github to v5 2024-08-24 16:03:51 +00:00
Gusted
eb25bc9edb Merge pull request 'fix: Do not scan all Go files for tailwind classes' (#5092) from fnetx/tailwind into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5092
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-24 14:59:00 +00:00
Otto Richter
85a0f1df1c fix: Do not scan all Go files for tailwind classes
Reduces some noise in the index.css file and adds a comment why it was done in the first place.
2024-08-24 15:45:50 +02:00
Earl Warren
2117aeabca Merge pull request 'Update module code.forgejo.org/forgejo/act to v1.21.2 (forgejo)' (#5087) from renovate/forgejo-code.forgejo.org-forgejo-act-1.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5087
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-08-24 05:38:09 +00:00
Gusted
dc6bd5c697 Merge pull request 'Update dependency webpack to v5.94.0 (forgejo)' (#5088) from renovate/forgejo-webpack-5.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5088
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-24 02:55:19 +00:00
Gusted
793dcfed34 Merge pull request 'Update dependency @github/relative-time-element to v4.4.3 (forgejo)' (#5086) from renovate/forgejo-github-relative-time-element-4.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5086
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-24 02:07:53 +00:00
Renovate Bot
ffdfe8817c Update dependency webpack to v5.94.0 2024-08-24 02:03:09 +00:00
Renovate Bot
ae8a692d8b Update module code.forgejo.org/forgejo/act to v1.21.2 2024-08-24 00:04:15 +00:00
Renovate Bot
276df16488 Update dependency @github/relative-time-element to v4.4.3 2024-08-24 00:03:36 +00:00
Gusted
904e1239a8 Merge pull request 'fix: improve the display of PR & issue short links' (#5075) from solomonv/pr-short-link-text-fixes into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5075
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-23 21:30:04 +00:00
Earl Warren
e5edd6ff8b Merge pull request 'chore(license): clarify the API swagger file is and stays MIT (take 2)' (#5084) from earl-warren/forgejo:wip-gpl into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5084
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-08-23 18:07:03 +00:00
Otto
66d06c2b8b Merge pull request 'feat(i18n): Heading for new branch rule, colon consistency' (#4993) from fnetx/branchprotection-fixes into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4993
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-08-23 17:29:20 +00:00
Earl Warren
9fee7ea763
chore(license): clarify the API swagger file is and stays MIT (take 2)
Override the swagger default.
2024-08-23 19:17:07 +02:00
Earl Warren
53187cd5e9 Merge pull request 'chore(license): clarify the API swagger file is and stays MIT' (#5083) from earl-warren/forgejo:wip-gpl into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5083
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-08-23 16:26:06 +00:00
Earl Warren
5e923cfbdd
chore(license): clarify the API swagger file is and stays MIT
It is not an original work and enforcing copyright on that file would
probably be difficult. To clarify that the intent of the Forgejo
authors is that it is used for interoperability with no restriction,
explicitly release it under MIT and display the intent in the swagger
web page.

There is a contradiction in claiming it is under MIT while claiming
copyright is unlikely to be enforceable, but it efficiently conveys
the intention.
2024-08-23 17:40:33 +02:00
Michael Kriese
27de894a6d Merge pull request 'chore(renovate): move settings to shared go preset' (#5066) from viceice/forgejo:chore/renovate/moved-settings into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5066
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-08-23 09:59:06 +00:00
Michael Kriese
9c0c3260ad
chore(renovate): use shared preset 2024-08-23 11:17:36 +02:00