Earl Warren
141e66b538
Merge pull request '[CI] backport auto-squash detection and -x' ( #2989 ) from earl-warren/forgejo:wip-backport-workaround into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2989
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-04-03 07:09:35 +00:00
Earl Warren
6c7179355e
[CI] backport auto-squash detection and -x
...
* Behaves as it should with merge & squashed pull requests
* Cherry-pick commits with -x for traceability
Refs: https://github.com/kiegroup/git-backporting/issues/113
2024-04-03 08:18:39 +02:00
Renovate Bot
8f3b2096a8
Update module github.com/editorconfig/editorconfig-core-go/v2 to v2.6.2
2024-04-03 04:08:11 +00:00
Renovate Bot
59bb7c2bf0
Update ghcr.io/visualon/renovate Docker tag to v37.278.0
2024-04-03 02:06:10 +00:00
Gusted
9320ffd2b5
[BUG] Make delay writer actually work
...
- Reading the code of this delay writer implemenation, it looks like
that it should only actually write content to the `io.Writer` if x
amount of time has passed by. However in practice it was always printing
the buffer even if the X amount of time didn't pass yet. This is in line
with what was being said in the issue that this was to help with
https://github.com/go-gitea/gitea/issues/9610 .
- This was caused by the extra `Close()` calls which in turn caused that
when the second `Close` is called (which is done in a defer already) it
would've printed the buffer anyway. So remove the extra calls to `Close()`.
- Add unit test.
2024-04-03 02:46:46 +02:00
Earl Warren
0a9f6297a3
Merge pull request 'Adjust the signed tag verification line' ( #2966 ) from algernon/forgejo:were-not-gonna-stop-until-we-reach-the-highest-top into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2966
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-02 22:02:03 +00:00
Gergely Nagy
d58143e4e1
Adjust the signed tag verification line
...
Move the signed tag verification line above the release notes, don't
disable the bottom margin, and make sure the verification line's box is
properly rounded like other boxes.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-04-02 23:02:34 +02:00
0ko
a245fb5c83
[THEME] Use better color for labels/counters
...
- improves contrast
- looks good
- improves consistency with other label-y elements
2024-04-02 17:40:34 +00:00
Earl Warren
4b8d06b0a7
Merge pull request 'Allow custom repo size format' ( #2974 ) from 0ko/forgejo:percent_s into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2974
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-02 15:08:41 +00:00
Earl Warren
2a006e850e
Merge pull request '[FEAT] Mark database errors in tests as failure' ( #2972 ) from gusted/forgejo-log-db into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2972
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-02 14:47:32 +00:00
Earl Warren
3aad608649
Merge pull request '[BUG] Use correct template for commitmail error' ( #2973 ) from gusted/forgejo-fix-committmail into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2973
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-02 14:45:54 +00:00
Gusted
58fc87091d
Merge pull request '[TESTS] fix flacky git check-attr subtest' ( #2963 ) from oliverpool/forgejo:git_check_attr_test into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2963
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-02 14:24:20 +00:00
0ko
2f38c2220f
[I18N] Allow custom repo size format
...
Following https://codeberg.org/forgejo/forgejo/pulls/2528#issuecomment-1721846
- simplify the code
- allow to have custom format in translations
- provide proper Russian translation because test depends on it
2024-04-02 18:43:12 +05:00
Gusted
27f39047c1
[BUG] Use correct template for commitmail error
...
- Use the correct template that was given when there's an error in
retrieving which git identity should be used.
- Remove the error from the exception list.
2024-04-02 15:08:53 +02:00
Gusted
2dabd202ce
[FEAT] Mark database errors in tests as failure
...
- If the database returns a error in integration tests, it should be
marked as a failure of the test.
- Ref: https://codeberg.org/forgejo/forgejo/issues/2962 (this should
help with logging the SQL that is resulting in the error).
2024-04-02 14:40:31 +02:00
Earl Warren
7e575603ee
Merge pull request 'Provide plural support for issue participants' ( #2695 ) from 0ko/forgejo:participants into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2695
2024-04-02 10:46:51 +00:00
Codeberg Translate
fc715fb31e
[I18N] Translations update from Weblate ( #2937 )
...
Translations update from [Weblate](https://translate.codeberg.org ) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/ ).
Current translation status:
![Weblate translation status](https://translate.codeberg.org/widget/forgejo/forgejo/horizontal-auto.svg )
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: Salif Mehmed <mail@salif.eu>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org>
Co-authored-by: Mormegil <Mormegil@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2937
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-04-02 10:45:15 +00:00
Gusted
20a3597220
[FEAT] Visual separation between types of attachments
...
- Add a visual (but still semantic way) separation between Forgejo's
generated attachments and the user's uploaded ones.
- The styling was first done by `ul` element, but is moved to the
individual list items to have better control over them.
- Add tooltip explaining the attachment was generated by Forgejo.
- Remove the tooltip of the other attachments and 'simplify' them into a text.
- Resolves #2893
Co-authored-by: 0ko <0ko@noreply.codeberg.org>
2024-04-02 12:30:47 +02:00
Earl Warren
a7190aa19a
Merge pull request 'Update dependency happy-dom to v14.3.10' ( #2959 ) from renovate/happy-dom-14.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2959
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-02 10:22:52 +00:00
oliverpool
cef39b2940
[TESTS] fix flack git check-attr flacky subtest
2024-04-02 11:56:48 +02:00
Earl Warren
04fcaf783e
Merge pull request 'fix: respond with JSON Resource Descriptor Content-Type per RFC7033' ( #2882 ) from realaravinth/forgejo:cb-2871 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2882
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-02 09:38:27 +00:00
2c2f146895
fix: respond with JSON Resource Descriptor Content-Type per RFC7033
2024-04-02 14:11:47 +05:30
Earl Warren
a2f603dedd
Merge pull request '[BUG] Use correct translation on closed milestones' ( #2957 ) from gusted/forgejo-milestone into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2957
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
2024-04-02 05:32:40 +00:00
Renovate Bot
335dd3cee6
Update dependency happy-dom to v14.3.10
2024-04-02 04:04:45 +00:00
Gusted
095d845f3c
[BUG] Use correct translation on closed milestones
...
- Uh self explanatory? Fix a typo.
- Regression of 365bb77a54
- Resolves https://codeberg.org/Codeberg/Community/issues/1526
2024-04-02 00:51:27 +02:00
Earl Warren
68e900822b
Merge pull request '[CI] backport workaround to cherry-pick in order' ( #2953 ) from earl-warren/forgejo:wip-git-backporting-order into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2953
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-01 19:40:01 +00:00
Earl Warren
385bcca788
Merge pull request 'Data size unit localization' ( #2528 ) from 0ko/forgejo:sizelocalize into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2528
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-01 19:31:26 +00:00
Earl Warren
ec091b59af
Merge pull request '[FEAT] Configure if protected branch rule should apply to admins' ( #2867 ) from gusted/forgejo-protectedbranch-admins into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2867
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-01 19:28:29 +00:00
Earl Warren
8194d7d760
Merge pull request 'Make pprof labels conformant with prometheus spec' ( #2933 ) from thefox/forgejo:pprof_fix into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2933
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-01 18:08:43 +00:00
0ko
53dc9f3393
Add integration test for (non-)archived label properties
2024-04-01 21:38:34 +05:00
Earl Warren
21dda0d1f7
[CI] backport workaround to cherry-pick in order
...
Refs: https://github.com/kiegroup/git-backporting/issues/114
2024-04-01 17:48:39 +02:00
Earl Warren
2e744dc991
Merge pull request 'Render inline file permalinks' ( #2669 ) from Mai-Lapyst/forgejo:markup-add-filepreview into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2669
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-01 13:57:01 +00:00
Earl Warren
b9a1d5c2be
Merge pull request 'Highlight signed tags like signed commits' ( #2534 ) from algernon/forgejo:message-in-a-bottle-ctrl-w-tag into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2534
2024-04-01 13:38:55 +00:00
0ko
1060b7cfa8
Add opacity and grayscale to archived labels
...
Co-authored-by: Gusted <gusted@noreply.codeberg.org>
2024-04-01 17:46:02 +05:00
0ko
cab47bbb0e
[I18N] Improve translatability of archived labels
...
Allow any position and writing style of `(Archived)`.
2024-04-01 17:46:02 +05:00
0ko
4b09dd11ec
[GITEA] Apply changes to archived labels
...
This is a squashed result of conflict resolution for the following commits from Gitea:
- 36de5b299b
- 9a93b1816e
- 712e19fa6f
- 83850cc479
It is lacking CSS rule for archived labels, though.
Changes in this commit are authored by:
- 6543
- delvh
- silverwind
2024-04-01 17:46:02 +05:00
Earl Warren
e18429aeb0
Merge pull request '[TESTS] disable test failure on log.Error for now' ( #2942 ) from oliverpool/forgejo:disable_logger_failures into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2942
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-01 09:37:01 +00:00
oliverpool
62148859b9
[TESTS] disable test failure on log.Error for now
2024-04-01 11:00:32 +02:00
Earl Warren
4d7a57a9f3
Merge pull request '[REFACTOR] git attribute: test proper cancellation and unify nul-byte reader' ( #2906 ) from oliverpool/forgejo:git_attr_error into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2906
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-01 05:58:37 +00:00
Earl Warren
75234fc6bc
Merge pull request '[TESTS] do not include line numbers in the error whitelist' ( #2936 ) from earl-warren/forgejo:wip-ignore-list into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2936
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-03-31 22:04:50 +00:00
Earl Warren
a60b34a451
[TESTS] do not include line numbers in the error whitelist
...
They are bound to change. The worst that can happen is that the same
error happens somewhere else and is ignored although it should
not. Which is not worse than the previous situation which was to
ignore all errors anyway.
Also be more liberal about what is ignored. Some error messages are
very long and may contain elements with some variance. It is enough to
have an ignored that is specific.
2024-03-31 23:32:49 +02:00
Gusted
e96714016c
Merge pull request '[BUG] Consistent styling for Sort filter' ( #2920 ) from gusted/forgejo-filter-type into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2920
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-03-31 20:58:30 +00:00
Earl Warren
9bd55ced76
Merge pull request '[CI] backport workaround to avoid duplicated job runs' ( #2934 ) from earl-warren/forgejo:wip-backport-workaround into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2934
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-03-31 19:02:54 +00:00
Earl Warren
d9b5df89e3
[CI] backport workaround to avoid duplicated job runs
...
Refs: https://codeberg.org/forgejo/forgejo/issues/2009
2024-03-31 17:34:21 +02:00
0ko
c2d137d1f2
Rename ByteSize to ReadableSize
2024-03-31 20:17:12 +05:00
TheFox0x7
c8f515dff7
[FIX] make pprof labels conformant with prometheus spec
2024-03-31 17:07:14 +02:00
Gusted
b7d55de222
[BUG] Consistent styling for Sort filter
...
- The dropdowns that contain filters for issues and pull requests are
currently not styled with the `small` class, which causes a smaller font
size to be set. Remove it for the `Sort` filter to make it consistent
and make it _more_ readable.
- Resolves #2914
2024-03-31 16:24:03 +02:00
Earl Warren
99842e9ff5
Merge pull request '[TESTS] prevent overriding testlogger when calling mainApp' ( #2846 ) from oliverpool/forgejo:non_failing_test into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2846
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-31 13:50:20 +00:00
Earl Warren
502db7a873
Merge pull request '[TESTS] pull review deletion (partial port of gitea#29888)' ( #2796 ) from oliverpool/forgejo:port_29888 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2796
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-03-31 13:48:15 +00:00
oliverpool
6b857193ff
[TESTS] pull review deleted from gitea#29888
...
Instead of db.TruncateBeans(db.DefaultContext, &issues_model.Review{}), reviews are deleted using issue.DeleteReview
2024-03-31 13:53:47 +02:00