bd97bd875d
[TESTS] deliver webhooks on localhost
2024-03-31 10:34:37 +02:00
b2312f32c4
Merge pull request 'English improvements' ( #2703 ) from 0ko/forgejo:english20240320 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2703
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-31 08:10:51 +00:00
76fca987a7
Merge pull request 'Fix New issue button position consistency' ( #2845 ) from 0ko/forgejo:issue-button-const into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2845
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-31 08:07:53 +00:00
e5d30af29d
Merge pull request '[CI] backport: show event information for debug purposes' ( #2923 ) from earl-warren/forgejo:wip-ci-backport into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2923
2024-03-31 07:00:40 +00:00
0bb7758cb0
git attribute: test proper cancellation and unify nul-byte reader
2024-03-31 08:44:09 +02:00
ae96a5e725
Merge pull request '[REFACTOR] add Icon to webhook.Interface' ( #2908 ) from oliverpool/forgejo:webhook_6_icon_method into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2908
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-31 06:22:51 +00:00
03cac08b1d
[I18N] Translations update from Weblate ( #2841 )
...
Translations update from [Weblate](https://translate.codeberg.org ) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/ ).
Current translation status:
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: kita <kita@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <Fjuro@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org>
Co-authored-by: Salif Mehmed <mail@salif.eu>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: Kaede Fujisaki <ledyba@users.noreply.translate.codeberg.org>
Co-authored-by: cherryb <cherryb@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2841
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
2024-03-31 06:16:47 +00:00
7aa686d979
[CI] backport: show event information for debug purposes
...
It will help figure out why two runs of testing happen when a backport
PR is open.
Refs: https://codeberg.org/forgejo/forgejo/pulls/2922
Refs: https://codeberg.org/forgejo/forgejo/issues/2009
2024-03-31 07:27:23 +02:00
7ec39aa756
Update bitnami/minio Docker tag to v2024.3.30
2024-03-31 02:07:27 +00:00
ebf8eb5b85
Merge pull request '[RELEASE] GITEA_VERSION is a fallback for FORGEJO_VERSION' ( #2861 ) from earl-warren/forgejo:wip-version into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2861
2024-03-30 22:23:37 +00:00
48a7bb90fe
Merge pull request '[BUG] Fix selector inner radius' ( #2860 ) from 0ko/forgejo:thousand_percent_scale into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2860
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 22:22:23 +00:00
e0421b28bf
Merge pull request '[FEAT] Use 'Text' instead of 'Plaintext'' ( #2833 ) from eo/forgejo:patch-1 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2833
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 22:21:14 +00:00
854164f40b
Merge pull request 'Fix accessibility and translatability of repo explore counters' ( #2862 ) from 0ko/forgejo:tr.repo.stars into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2862
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 22:14:22 +00:00
46fead4c73
Merge pull request '[BUG] Don't color dot literal color names' ( #2905 ) from gusted/forgejo-colordots into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2905
Reviewed-by: Algernon <algernon@noreply.codeberg.org>
2024-03-30 22:08:36 +00:00
0532a91b1a
populate testlogger ignoreList
2024-03-30 22:50:54 +01:00
bc080070ed
An integration test for SSH signed tags
...
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-03-30 20:14:42 +01:00
432ff7d767
Highlight signed tags like signed commits
...
This makes signed tags show a badge in the tag list similar to signed
commits in the commit list, and a more verbose block when viewing a
single tag. Works for both GPG and SSH signed tags.
Fixes #1316 .
Work sponsored by @glts.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-03-30 20:14:42 +01:00
bbf612b3a8
Merge pull request '[CI] run renovate daily instead of every 30 minutes' ( #2913 ) from earl-warren/forgejo:wip-renovate into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2913
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 16:49:20 +00:00
ae5e0c0ff6
[CI] run renovate daily instead of every 30 minutes
...
It was necessary in the debug period to help with a faster debug
loop. Now that it works reliably, there is no need for renovate
updates more than once a day.
It will still possible to force a run, should it be necessary, by
re-running the last scheduled job.
2024-03-30 17:48:08 +01:00
ff6feca946
Merge pull request 'Update module github.com/go-sql-driver/mysql to v1.8.1' ( #2911 ) from renovate/github.com-go-sql-driver-mysql-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2911
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 16:41:38 +00:00
dae95f473e
Deprecate usage of FileSize in templates
2024-03-30 21:10:47 +05:00
bba1884582
Add integration test for TrSize
2024-03-30 21:10:47 +05:00
075e0de142
Add unit test for TrSize
2024-03-30 21:10:47 +05:00
29cc80d849
Provide a way to translate data units
2024-03-30 21:10:47 +05:00
7b9c346cde
Add data unit translations
2024-03-30 21:10:18 +05:00
892fc82a20
Fix New issue button consistency
...
Fixes https://codeberg.org/forgejo/forgejo/issues/2613
Based on https://codeberg.org/forgejo/forgejo/issues/2613#issuecomment-1654709
- add new class `list-header-issues`;
- add rules that fix button position;
- use variable to keep the vertical offset constant;
- fix gap for edit button.
Co-authored-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 21:08:34 +05:00
177d8e7769
Fix selector inner radius
...
- Fixes https://codeberg.org/forgejo/forgejo/issues/2835
2024-03-30 21:04:48 +05:00
d183d32c58
[I18N] English improvements
2024-03-30 20:54:04 +05:00
cd19564acc
models/asymkey: Implement Tag verification
...
This is, in large part, a refactoring: we rename `CommitVerification` to
`ObjectVerification`, and adjust `ParseObjectWithSignature` (previously
`ParseCommitWithSignature`) to work on an object, rather than a commit.
This in turn, lets us implement `ParseTagWithSignature` on top of it, so
commit & tag signature verification will share most of the code.
Work sponsored by @glts.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-03-30 16:22:05 +01:00
69115baf41
[REFACTOR] use Icon from interface in webhook list
2024-03-30 16:00:06 +01:00
120fa61a0a
[REFACTOR] add Icon to webhook.Interface
2024-03-30 15:59:56 +01:00
85cbdefaaa
Update module github.com/go-sql-driver/mysql to v1.8.1
2024-03-30 14:46:43 +00:00
afcff0eebd
Fix
2024-03-30 15:23:48 +01:00
bc04183e47
Merge pull request 'Update module github.com/felixge/fgprof to v0.9.4' ( #2805 ) from renovate/github.com-felixge-fgprof-0.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2805
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 13:47:43 +00:00
71df02bc09
Merge pull request 'Update dependency happy-dom to v14.3.9' ( #2900 ) from renovate/happy-dom-14.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2900
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 13:45:55 +00:00
80f22ab0d8
[BUG] Don't color dot literal color names
...
- Colordots are generated for colors in inline code, such as `red`,
`rgb(255, 0, 124)`, `#ffaabb` and `hsl(124, 52%, 50%)`. However this
shouldn't be doon for literal color names as these can be too common
assiocated with non-color related stuff _and matches the behavior of
some other forge_.
- Move the regexes from bluemonday to Forgejo and do the checking
ourselves.
- Adds unit tests.
- Resolves https://codeberg.org/Codeberg/Community/issues/1510
2024-03-30 14:30:41 +01:00
57d27dcbee
Merge pull request '[CI] allow backports to be launched on merged pull requests' ( #2903 ) from earl-warren/forgejo:wip-ci-backport into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2903
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 13:17:09 +00:00
d8ab364889
[CI] allow backports to be launched on merged pull requests
...
The intention was good initially but the expression was wrong for two
reasons:
* When a pull_request event is received for a labeled action, the
match should be github.event.action == 'label_updated' and not
'labeled'
* The event does not have a github.event.label field and
contains(github.event.label.name, 'backport/v') will always be
false.
Since the expression is only evaluated in the context of a merged pull
request, either because it was just closed or because it was labeled
after the fact, the only verification that is needed is to assert that
there is at least one `backport/v*` label.
2024-03-30 13:35:56 +01:00
05376503ed
Update dependency happy-dom to v14.3.9
2024-03-30 11:48:44 +00:00
ec459b23c8
Merge pull request '[BUG] Render emojis in labels in issue info popup' ( #2888 ) from gusted/forgejo-emoji-popup into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2888
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-30 11:20:57 +00:00
0761207cc2
Merge pull request 'Update module github.com/minio/minio-go/v7 to v7.0.69' ( #2851 ) from renovate/github.com-minio-minio-go-v7-7.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2851
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-30 11:11:37 +00:00
659452a1bc
Merge pull request 'Improve look of user profiles' ( #2875 ) from 0ko/forgejo:profile-card-bg into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2875
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-30 10:19:12 +00:00
ddc24177dd
[BUG] Render emojis in labels in issue info popup
...
- Currently emojis that are part of the label's name aren't rendered
when shown in the popup that you get when you hover over issue
references.
- This patch fixes that by rendering the emoji.
- Adds CSS to not make the emoji big in the label.
- Resolves #1531
2024-03-30 11:18:46 +01:00
053ab13f99
Merge pull request '[CI] backport strategy must fail when it conflicts' ( #2896 ) from earl-warren/forgejo:wip-ci-backport into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2896
2024-03-30 10:13:15 +00:00
02dcd07437
Update module github.com/felixge/fgprof to v0.9.4
2024-03-30 10:11:45 +00:00
2e3ea3e045
Merge pull request 'Update module github.com/opencontainers/image-spec to v1.1.0' ( #2858 ) from renovate/github.com-opencontainers-image-spec-1.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2858
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-30 09:54:35 +00:00
951a276174
Improve look of user profiles
...
- use more standard backgounds for user card and readme
- add proper border to user card
2024-03-30 14:40:50 +05:00
ffdba30a62
[CI] backport strategy must fail when it conflicts
...
strategy: ort
The strategy is changed from "recursive" to "ort", which is the
default for git >= 2.43.2 and claims to reduce the likelyhood of
conflicts according to man git-merge:
> This has been reported to result in fewer merge conflicts without
> causing mismerges...
strategy-option: find-renames
The default option are the same for both strategies and "theirs" will:
> This option forces conflicting hunks to be auto-resolved
> cleanly by favoring their version.
"their" being whatever is not in the commits being cherry-picked.
In the context of Forgejo backports, this is not what is desired:
whenever a conflict happens it needs to be manually resolved and
prefering whatever is in the stable branch will not lead to a sane
backport.
It is changed back to "find-renames" which is documented to be the
default:
> Turn on rename detection, optionally setting the similarity
> threshold. This is the default.
Fixes: https://codeberg.org/forgejo/forgejo/issues/2886
2024-03-30 10:34:23 +01:00
91b745a5b6
Merge pull request '[gitea] week 14 cherry-pick' ( #2872 ) from earl-warren/forgejo:wip-gitea-cherry-pick into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2872
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-30 08:01:06 +00:00
8f10247585
[BUG] Fix Ctrl+Enter on editor (followup)
...
s/$editContentZone/editContentZone/
because the variable was renamed by
Remove jQuery `.attr` from the code comments (#30112 )
2024-03-30 07:17:32 +01:00
oliverpool
