Gergely Nagy
220c3fe3b3
Expand code diffs against the commits repo
...
When expanding code diffs, the expansion should search for more context
in the commits repo, rather than in the repo in context, because the
commit may not be available in the base repo. For example, when
previewing a pull request, the commit is not in the target repo yet -
it's in the fork.
Fixes #3746 .
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-05-14 10:25:28 +02:00
Beowulf
2810b9ae0a
Replace reply with a forked version to fix the cut-off of the incoming mail text ( #3747 )
...
replace reply with forgejos forked version
If plain text is selected as the message format in e.g. Apple Mail, the inline attachments are no longer at the end of the mail, but instead directly where they are in the mail. When parsing the mail, these inline attachments are replaced by "--". The new reply version no longer cuts the text at the first "--".
Tests for this are present in reply (7dc5750c6dhttps://codeberg.org/forgejo/forgejo/issues/3496#issuecomment-1798416
---
Additionally, I reduced the allocations for the inline attachments.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3747
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Beowulf <beowulf@beocode.eu>
Co-committed-by: Beowulf <beowulf@beocode.eu>
2024-05-13 21:24:58 +00:00
Earl Warren
d09a6d130c
Merge pull request 'Update module github.com/go-enry/go-enry/v2 to v2.8.8' ( #3723 ) from renovate/github.com-go-enry-go-enry-v2-2.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3723
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-13 18:28:44 +00:00
Earl Warren
b873107275
Merge pull request 'Rename Str2html to SanitizeHTML and clarify its behavior (followup) (take 2)' ( #3744 ) from earl-warren/forgejo:wip-notify-push into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3744
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-05-13 18:26:47 +00:00
0ko
e4e84a7ecf
Improve translatability of "Transfer ownership" ( #3739 )
...
This text can have different forms in other languages depending on context.
The commit also contains a change to .editorconfig to prevent EoF changes when mass-replacing strings, as that causes unintentional merge conflicts with Weblate.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3739
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-13 18:22:16 +00:00
0ko
61643a698c
Translation updates from Weblate ( #3748 )
...
This is not the usual Weblate PR. I did not reset Weblate after squash-merging https://codeberg.org/forgejo/forgejo/pulls/3637 , so Weblate failed to rebase and locked. These are manually cherry-picked commits that Weblate produced after that PR was merged. We need to squash-merge them too before resetting Weblate, so the new translations don't get lost.
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: Cwpute <Cwpute@users.noreply.translate.codeberg.org>
Co-authored-by: Mylloon <Mylloon@users.noreply.translate.codeberg.org>
Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org>
Co-authored-by: owofied <furry@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3748
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-13 18:16:35 +00:00
Earl Warren
4b59e3f971
Merge pull request 'Port "Use CSS inset shorthand ( #30939 )"' ( #3745 ) from proton-ab/forgejo:pr/css-inset into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3745
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-13 16:02:05 +00:00
Earl Warren
48c18e17d5
chore(release-notes): go-enry v2.8.8
...
Refs: https://codeberg.org/forgejo/forgejo/pulls/3723
2024-05-13 17:32:28 +02:00
Earl Warren
337f4f9d87
Rename Str2html to SanitizeHTML and clarify its behavior (followup) (take 2)
...
In
801792e4dchttps://codeberg.org/forgejo/forgejo/issues/3554
2024-05-13 17:05:03 +02:00
silverwind
584f36f0a1
Use CSS inset shorthand ( #30939 )
...
Use [inset](https://developer.mozilla.org/en-US/docs/Web/CSS/inset )
shorthand instead of longhands. There may be more cases but these ones I
was able to definitely identify.
Signed-off-by: proton <proton_ab@tuta.io>
2024-05-13 17:00:21 +02:00
Earl Warren
286cb4cde8
Merge pull request 'Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.58.1' ( #3736 ) from renovate/github.com-golangci-golangci-lint-cmd-golangci-lint-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3736
2024-05-13 13:32:25 +00:00
Earl Warren
66cb6732ed
chore(dependency): automerge golangci-lint upgrades
2024-05-13 14:36:54 +02:00
0ko
182d5eeef9
[I18N] Improve base locale related to settings and accounts ( #3733 )
...
- general English improvements
- separated the header of Language part in user settings into a new string for better translatability
- made that header contain "Default", just like the theme one, because this is how this actually works: the bottom selector saves the language temporarily, the selector in the settings saves it permanently. Not many users know about this difference. This clarification will help some
- removed some of "Manage" from the headers where they aren't really needed. This improves the consistency with some other headers
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3733
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-13 12:05:49 +00:00
Earl Warren
cf8641964c
Merge pull request 'Improve how icon colors are defined' ( #3702 ) from 0ko/forgejo:ui-icon-contrast into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3702
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-13 11:48:41 +00:00
Codeberg Translate
010cccd33e
[I18N] Translations update from Weblate ( #3637 )
...
Translations update from [Weblate](https://translate.codeberg.org ) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/ ).
Co-authored-by: Kaede Fujisaki <ledyba@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: kdh8219 <kdh8219@monamo.dev>
Co-authored-by: enricpineda <enricpineda@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: nmmr <nmmr@users.noreply.translate.codeberg.org>
Co-authored-by: VioletLul <VioletLul@users.noreply.translate.codeberg.org>
Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: Nifou <Nifou@users.noreply.translate.codeberg.org>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3637
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-05-13 11:48:36 +00:00
Earl Warren
bef650d4a4
Merge pull request 'Update module github.com/golangci/misspell/cmd/misspell to v0.5.1' ( #3737 ) from renovate/github.com-golangci-misspell-cmd-misspell-0.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3737
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-13 10:15:57 +00:00
Renovate Bot
4fadf7c75b
Update module github.com/golangci/misspell/cmd/misspell to v0.5.1
2024-05-13 02:04:30 +00:00
Renovate Bot
418cd41f14
Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.58.1
2024-05-13 00:06:54 +00:00
Earl Warren
c18094ee07
Merge pull request 'chore(renovate): manually upgrade xgo, oapi-codegen & kin-openapi' ( #3732 ) from earl-warren/forgejo:wip-renovate into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3732
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-05-12 18:06:28 +00:00
Renovate Bot
8672ad12b1
Update module github.com/caddyserver/certmagic to v0.21.0 ( #3724 )
...
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/caddyserver/certmagic](https://github.com/caddyserver/certmagic ) | require | minor | `v0.20.0` -> `v0.21.0` |
---
### Release Notes
<details>
<summary>caddyserver/certmagic (github.com/caddyserver/certmagic)</summary>
### [`v0.21.0`](https://github.com/caddyserver/certmagic/releases/tag/v0.21.0 )
[Compare Source](https://github.com/caddyserver/certmagic/compare/v0.20.0...v0.21.0 )
CertMagic v0.21 introduces some big changes:
- Draft support for draft-03 of [ACME Renewal Information (ARI)](https://datatracker.ietf.org/doc/draft-ietf-acme-ari/ ) which assists with deciding when to renew certificates. This augments CertMagic's already-advanced logic using cert lifetime and OCSP/revocation status.
- New [`ZeroSSLIssuer`](https://pkg.go.dev/github.com/caddyserver/certmagic@v0.21.0#ZeroSSLIssuer ) uses the [ZeroSSL API](https://zerossl.com/documentation/api/ ) to get certificates. ZeroSSL also has an ACME endpoint, which can still be accesed using the existing ACMEIssuer, as always. Their proprietary API is paid, but has extra features like IP certificates, better reliability, and support.
- DNS challenges should be smoother in some cases as we've improved propagation checking.
- In the odd case your ACME account disappears from the ACME server, CertMagic will automatically retry with a new account. (This happens in some test/dev environments.)
- ACME accounts are identified only by their public keys, but CertMagic maps accounts by CA+email for practical/storage reasons. So now you can "pin" an account key to use by specifying your email and the account public key in your config, which is useful if you need to absolutely be sure to use a specific account (like if you get rate limit exemptions from a CA).
Please try it out and report any issues!
Thanks to [@​Framer](https://github.com/Framer ) for their contributions to this release!
#### What's Changed
- Bump golang.org/x/crypto from 0.14.0 to 0.17.0 by [@​dependabot](https://github.com/dependabot ) in https://github.com/caddyserver/certmagic/pull/264
- Demote "storage cleaning happened too recently" from WARN to INFO by [@​francislavoie](https://github.com/francislavoie ) in https://github.com/caddyserver/certmagic/pull/270
- Check DNS propagation at authoritative nameservers only with default resolvers by [@​pgeh](https://github.com/pgeh ) in https://github.com/caddyserver/certmagic/pull/274
- Retry with new account if account disappeared remotely by [@​mholt](https://github.com/mholt ) in https://github.com/caddyserver/certmagic/pull/269
- Update readme examples to use TLS-ALPN const from ACMEz by [@​goksan](https://github.com/goksan ) in https://github.com/caddyserver/certmagic/pull/277
- Initial implementation of ZeroSSL API issuer by [@​mholt](https://github.com/mholt ) in https://github.com/caddyserver/certmagic/pull/279
- Allow deleting directories via FileStorage by [@​goksan](https://github.com/goksan ) in https://github.com/caddyserver/certmagic/pull/282
- Use the `email` configuration in the ACME issuer to "pin" an account to a key by [@​ankon](https://github.com/ankon ) in https://github.com/caddyserver/certmagic/pull/283
- Initial implementation of ARI by [@​mholt](https://github.com/mholt ) in https://github.com/caddyserver/certmagic/pull/286
#### New Contributors
- [@​pgeh](https://github.com/pgeh ) made their first contribution in https://github.com/caddyserver/certmagic/pull/274
- [@​goksan](https://github.com/goksan ) made their first contribution in https://github.com/caddyserver/certmagic/pull/277
**Full Changelog**: https://github.com/caddyserver/certmagic/compare/v0.20.0...v0.21.0
</details>
---
### Configuration
📅 **Schedule**: Branch creation - "before 4am" (UTC), Automerge - "before 4am" (UTC).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
---
This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate ).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNTEuMiIsInVwZGF0ZWRJblZlciI6IjM3LjM1MS4yIiwidGFyZ2V0QnJhbmNoIjoiZm9yZ2VqbyIsImxhYmVscyI6W119-->
Co-authored-by: Earl Warren <contact@earl-warren.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3724
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
2024-05-12 14:56:39 +00:00
Earl Warren
0a67dbffb0
chore(renovate): manually upgrade xgo, oapi-codegen & kin-openapi
2024-05-12 15:58:52 +02:00
Earl Warren
3678c376c9
Merge pull request 'Update postcss packages' ( #3713 ) from renovate/postcss-packages into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3713
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-05-12 10:55:40 +00:00
Renovate Bot
95b2821824
Update module github.com/go-enry/go-enry/v2 to v2.8.8
2024-05-12 00:05:15 +00:00
Earl Warren
6c33d55d16
Merge pull request 'Add class tw-break-anywhere' ( #3718 ) from 0ko/forgejo:ui-pick-break into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3718
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-11 17:09:11 +00:00
Earl Warren
9915e163c5
Merge pull request 'Update ghcr.io/devcontainers/features/git-lfs Docker tag to v1.2.0' ( #3715 ) from renovate/ghcr.io-devcontainers-features-git-lfs-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3715
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-11 16:46:20 +00:00
Earl Warren
7cdd5e546f
Merge pull request 'Update mcr.microsoft.com/devcontainers/go Docker tag to v1.22' ( #3716 ) from renovate/mcr.microsoft.com-devcontainers-go-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3716
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-11 16:45:58 +00:00
0ko
b45fbe1dcc
Add class tw-break-anywhere
...
very partial port of 9946353282 (diff-38f10be6b48c74bcacbf9f6e15cc8582a45b7a6cbd1cdd8efec8e592575290c5)
2024-05-11 18:15:29 +05:00
Renovate Bot
6f3c50e75d
Update postcss packages
2024-05-11 12:03:36 +00:00
Renovate Bot
2db58b786d
Update mcr.microsoft.com/devcontainers/go Docker tag to v1.22
2024-05-11 02:04:41 +00:00
Renovate Bot
84d01b1828
Update ghcr.io/devcontainers/features/git-lfs Docker tag to v1.2.0
2024-05-11 02:04:33 +00:00
0ko
b1a239cdc4
Improve how icon colors are defined
...
- define specific colors for icons for themes
- fix related contrast issues on Forgejo dark theme
2024-05-10 23:19:35 +05:00
Earl Warren
cf0e451ef4
Merge pull request 'templates: Be more forgiving about missing package metadata' ( #3701 ) from algernon/forgejo:missing-metadata-makes-me-mumble-murky-messages into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3701
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-10 18:06:04 +00:00
Gergely Nagy
ac4d535dbf
templates: Be more forgiving about missing package metadata
...
When rendering templates for packages, be more forgiving about missing
metadata. For some repository types - like maven - metadata is uploaded
separately. If that upload fails, or does not happen, there will be no
metadata.
In that case, Forgejo should handle it gracefully, and render as much of
the information as possible, without erroring out. Rendering without
metadata allows one to delete a partial package, while if we throw
errors, that becomes a whole lot harder.
This patch adjusts the generic metadata template, and also the maven
template. There may be more cases of the same problem lying around.
Fixes #3663 .
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-05-10 12:07:24 +02:00
Earl Warren
09855c0caf
Merge pull request 'Add a release note for #3285 ' ( #3697 ) from algernon/forgejo:release-notes/cloning-in-sshtyle into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3697
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-10 09:32:35 +00:00
Earl Warren
46e81f0890
Merge pull request 'Add a release note for #3464 ' ( #3698 ) from algernon/forgejo:release-notes/i-object-exclamationmark-format-name into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3698
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-10 09:31:51 +00:00
Earl Warren
69bc0fb8b3
Merge pull request '[PORT] gitea#30535: Refactor and fix archive link bug' ( #3696 ) from algernon/forgejo:si-si-no-jquery into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3696
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-10 09:30:57 +00:00
Gergely Nagy
a5c038f5e8
Add a release note for #3464
...
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-05-10 09:39:52 +02:00
Gergely Nagy
9d1ceee797
Add a release note for #3285
...
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-05-10 09:32:07 +02:00
wxiaoguang
7dd3c01606
Refactor and fix archive link bug ( #30535 )
...
Regression of #29920
Fixes : #30569
Also this is a rewriting to eliminate the remaining jQuery usages from code.
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit d0e07083559180b124a08359fcc72f9ef695e723)
Conflicts:
- web_src/js/features/repo-common.js
Conflict resolved in favour of Gitea.
2024-05-10 09:20:12 +02:00
Earl Warren
88804dd558
Merge pull request 'Update dependency happy-dom to v14.10.1' ( #3695 ) from renovate/happy-dom-14.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3695
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-10 05:26:46 +00:00
Earl Warren
19fec86f9b
Merge pull request 'Update dependency swagger-ui-dist to v5.17.7' ( #3693 ) from renovate/swagger-ui-dist-5.17.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3693
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-10 05:24:55 +00:00
Earl Warren
0dec5bb161
Merge pull request 'Update dependency eslint-plugin-vue to v9.26.0' ( #3694 ) from renovate/linters into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3694
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-10 05:23:21 +00:00
Renovate Bot
7a5f0faf0c
Update dependency happy-dom to v14.10.1
2024-05-10 02:06:06 +00:00
Renovate Bot
9a812f16bd
Update dependency eslint-plugin-vue to v9.26.0
2024-05-10 02:05:33 +00:00
Renovate Bot
1148206fc8
Update dependency swagger-ui-dist to v5.17.7
2024-05-10 00:08:05 +00:00
Earl Warren
e49e0ebe56
Merge pull request 'Fix some 7.0 missing variables' ( #3685 ) from 0ko/forgejo:ui-var-fixes into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3685
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-09 18:42:42 +00:00
Earl Warren
456b82d2bb
Merge pull request '[PORT] gitea#29674: Add result check in TestAPIEditUser' ( #3686 ) from algernon/forgejo:gitea/port/29674 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3686
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-09 18:35:29 +00:00
Earl Warren
15fe4fd175
Merge pull request 'Teach activities.GetFeeds() how to avoid returning duplicates' ( #3598 ) from algernon/forgejo:action-inaction-reaction into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3598
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-05-09 18:33:21 +00:00
yp05327
f81890fa95
Add result check in TestAPIEditUser ( #29674 )
...
Fix #29514
There are too many usage of `NewRequestWithValues`, so there's no need
to check all of them.
Just one is enough I think.
(cherry picked from commit ecd1d96f494d2400f7659165ff9376354edda395)
Conflicts:
- tests/integration/api_admin_test.go
Conflict resolved by manually applying the change to
`full_name`.
2024-05-09 19:26:21 +02:00
0ko
0dc35c9df9
[THEME] Fix some 7.0 missing variables
2024-05-09 21:58:23 +05:00
