tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1
18508 commits 11 branches 231 tags 584 MiB
Commit graph

18508 commits

This branch
This branch
All branches
Author SHA1 Message Date
Earl Warren
279d1a85f0 Merge pull request '[v7.0/forgejo] Plural support for release download count' (#3037) from bp-v7.0/forgejo-2fff6c2 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3037
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-04-04 18:36:48 +00:00
Earl Warren
2c263b2732 Merge pull request '[v7.0/forgejo] feat: add optional storage init to doctor commands' (#3035) from bp-v7.0/forgejo-e226a27 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3035
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-04-04 18:36:03 +00:00
Earl Warren
2bf3723939 Merge pull request '[v7.0/forgejo] [BUG] Fix crash in issue forms' (#3036) from bp-v7.0/forgejo-b0cd0eb into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3036
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-04 18:35:37 +00:00
0ko
bf275ac92f [I18N] Provide plural support for release download count 
Following https://codeberg.org/forgejo/forgejo/pulls/2899 and my review

See https://codeberg.org/forgejo/forgejo/pulls/3031#issuecomment-1733158 for why older strings were dropped

(cherry picked from commit 2fff6c255d)
 2024-04-04 17:29:14 +00:00
Gusted
aefdf17a75 [BUG] Fix crash in issue forms 
- Fix a crash in the issue forms, because `ctx.Ctx` was trying to be
accessed, however this is not set in all contexts thus could result to NPE.
- Adds integration test.
- Resolves #3011

(cherry picked from commit b0cd0ebb91)
 2024-04-04 16:57:55 +00:00
Michael Kriese
5b7d454dd8 feat: add optional storage init to doctor commands 
(cherry picked from commit e226a27233)
 2024-04-04 16:56:55 +00:00
Earl Warren
fbaebbd644 Merge pull request '[v7.0/forgejo] [FEAT] Visual separation between types of attachments' (#3029) from bp-v7.0/forgejo-20a3597 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3029
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-04-04 16:43:39 +00:00
Gusted
139979f25d Merge pull request '[v7.0/forgejo] [BUG] Center icon and callout text' (#3027) from bp-v7.0/forgejo-6ffae46 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3027
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-04 14:59:10 +00:00
Gusted
86d018dffc [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>
(cherry picked from commit 20a3597220)
 2024-04-04 13:56:55 +00:00
Gusted
06e72e22d5 [BUG] Center icon and callout text 
- Wrap the icon and callout into a seperate `<p>` which has `display:
flex; align-items: center` set. To center the icon with the callout text.
- Resolves #3006

(cherry picked from commit 6ffae461d4)
 2024-04-04 12:18:32 +00:00
Earl Warren
bc873f2e83 Merge pull request '[v7.0/forgejo] Better color for labels/counters' (#3024) from bp-v7.0/forgejo-a245fb5 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3024
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-04-04 12:08:48 +00:00
0ko
0f2e315b02 [THEME] Use better color for labels/counters 
- improves contrast
- looks good
- improves consistency with other label-y elements

(cherry picked from commit a245fb5c83)
 2024-04-04 07:55:33 +00:00
Earl Warren
594c9c4570 Merge pull request '[v7.0/forgejo] Port archived labels visual filter' (#3009) from bp-v7.0/forgejo-53dc9f3-1060b7c-cab47bb-4b09dd1 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3009
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-04-04 07:31:38 +00:00
Earl Warren
f97a1ed948 Merge pull request '[v7.0/forgejo] Update dependency go to v1.22.2' (#3020) from bp-v7.0/forgejo-3509242-ded1080-e6da9c6 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3020
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-04 07:29:23 +00:00
Earl Warren
11d50ab72e [CI] pin go v1.22.2 version 
Because setup-go fails to pick it up. It usually happens within 24h
and this commit can be reverted then.

(cherry picked from commit 3509242ee6)
 2024-04-04 06:09:34 +00:00
Gusted
b74c8015f1 [CHORE] Update golang.org/x/net 
Per https://pkg.go.dev/vuln/GO-2024-2687

(cherry picked from commit ded1080bc2)
 2024-04-04 06:09:34 +00:00
Renovate Bot
149efabe07 Update dependency go to v1.22.2 
(cherry picked from commit e6da9c6cd9)
 2024-04-04 06:09:34 +00:00
Earl Warren
ccc51051c5 Merge pull request '[v7.0/forgejo] fix: set proper go directive' (#3019) from bp-v7.0/forgejo-99efe01 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3019
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-04 06:05:15 +00:00
Michael Kriese
f3ea363dd2 fix: set proper go directive 
(cherry picked from commit 99efe01a08)
 2024-04-04 05:58:09 +00:00
Earl Warren
41d87998d7 Merge pull request '[v7.0/forgejo] [FEAT] Allow non-explicit push options' (#3008) from bp-v7.0/forgejo-f5ad6d4 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3008
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-04-03 20:23:42 +00:00
0ko
64bbd545a2 Add integration test for (non-)archived label properties 
(cherry picked from commit 53dc9f3393)
 2024-04-03 20:14:39 +00:00
0ko
db1a36673e Add opacity and grayscale to archived labels 
Co-authored-by: Gusted <gusted@noreply.codeberg.org>
(cherry picked from commit 1060b7cfa8)
 2024-04-03 20:14:39 +00:00
0ko
b068d193d0 [I18N] Improve translatability of archived labels 
Allow any position and writing style of `(Archived)`.

(cherry picked from commit cab47bbb0e)
 2024-04-03 20:14:39 +00:00
0ko
4ef8b139f2 [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

(cherry picked from commit 4b09dd11ec)
 2024-04-03 20:14:39 +00:00
Earl Warren
e3c46541bd Merge pull request '[v7.0/forgejo] Fix primary button background inconsistency' (#3007) from bp-v7.0/forgejo-d44f290 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3007
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-03 20:01:59 +00:00
Earl Warren
0d4daa9455 Merge pull request '[v7.0/forgejo] [THEME] Update variables' (#3003) from bp-v7.0/forgejo-eae9397 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3003
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-04-03 20:01:25 +00:00
Gusted
5c3dff26d6 [FEAT] Allow non-explicit push options 
- Currently the parsing of the push options require that `=` is present
in the value, however we shouldn't be that strict and assume if that's
not set the value is `true`.
- This allow for more natural commands, so become `-o force-push=true`
simply `-o force-push`.
- Add unit test.

(cherry picked from commit f5ad6d4be5)
 2024-04-03 19:04:01 +00:00
0ko
3a46a37586 [UI] Fix primary button background inconsistency 
Fixes https://codeberg.org/forgejo/forgejo/issues/2947

(cherry picked from commit d44f290750)
 2024-04-03 19:03:03 +00:00
Earl Warren
0a086dffc0 Merge pull request '[v7.0/forgejo] Simplify delay writer Close' (#3005) from bp-v7.0/forgejo-6acedb9 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3005
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
 2024-04-03 18:58:03 +00:00
Earl Warren
648da47046 Merge pull request '[v7.0/forgejo] [BUG] Disable 'View at this point in history' for wikis' (#3004) from bp-v7.0/forgejo-8df9100 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3004
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-03 18:57:46 +00:00
Gusted
5fdadbfe08 Simplify delay writer Close 
Per https://codeberg.org/forgejo/forgejo/pulls/2983#issuecomment-1730756

(cherry picked from commit 6acedb973a)
 2024-04-03 17:30:44 +00:00
Gusted
858fbbaafd [BUG] Disable 'View at this point in history' for wikis 
- Don't show the 'View at this point in history' button for wikis as
wikis don't have this feature.
- Adds integration test
- Resolves https://codeberg.org/forgejo/forgejo/issues/2995

(cherry picked from commit 8df9100994)
 2024-04-03 17:10:28 +00:00
Gusted
4d2cd6c806 [THEME] Update variables 
- Follows a579a0f318
- Remove `--color-code-sidebar-bg`.
- `--color-active-line` -> `--color-highlight-bg`.
- Add `--color-highlight-fg`.
- Resolves #2964

(cherry picked from commit eae9397fa2)
 2024-04-03 16:50:58 +00:00
oliverpool
713ac6f5d5 Merge pull request '[v7.0/forgejo] [BUG] Make delay writer actually work' (#2990) from bp-v7.0/forgejo-9320ffd into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2990
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-03 11:49:19 +00:00
Earl Warren
0e2e21b584 Merge pull request '[v7.0/forgejo] [TESTS] pull review deletion (partial port of gitea#29888)' (#2992) from bp-v7.0/forgejo-6b85719 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2992
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
 2024-04-03 08:55:01 +00:00
oliverpool
585e6137f7 [TESTS] pull review deleted from gitea#29888 
Instead of db.TruncateBeans(db.DefaultContext, &issues_model.Review{}), reviews are deleted using issue.DeleteReview

(cherry picked from commit 6b857193ff)
 2024-04-03 08:13:14 +00:00
Gusted
71e63f541d [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.

(cherry picked from commit 9320ffd2b5)
 2024-04-03 07:34:49 +00:00
Earl Warren
c0fb79b436 Merge pull request '[v7.0/forgejo] Adjust the signed tag verification line' (#2981) from bp-v7.0/forgejo-d58143e into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2981
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
 2024-04-03 06:32:36 +00:00
Gergely Nagy
6051722460 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 22:03:30 +00:00
Earl Warren
f3ce65a3fc Merge pull request '[v7.0/forgejo] Allow custom repo size format' (#2980) from bp-v7.0/forgejo-2f38c22 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2980
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-04-02 18:39:09 +00:00
Earl Warren
96b2ec888a Merge pull request '[v7.0/forgejo] Make pprof labels conformant with prometheus spec' (#2955) from bp-v7.0/forgejo-c8f515d into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2955
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-02 18:38:41 +00:00
0ko
f3b6759ab7 [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:04:32 +00:00
Earl Warren
2b8d95c8c2 Merge pull request '[v7.0/forgejo] Data size unit localization' (#2979) from bp-v7.0/forgejo-c2d137d-dae95f4-bba1884-075e0de-29cc80d-7b9c346 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2979
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-04-02 18:02:15 +00:00
0ko
470886bf52 Rename ByteSize to ReadableSize 2024-04-02 17:29:32 +00:00
0ko
d2cd1342bf Deprecate usage of FileSize in templates 2024-04-02 17:29:32 +00:00
0ko
e5212c8c96 Add integration test for TrSize 2024-04-02 17:29:32 +00:00
0ko
24552ee9ee Add unit test for TrSize 2024-04-02 17:29:32 +00:00
0ko
7b24b669ed Provide a way to translate data units 2024-04-02 17:29:32 +00:00
0ko
482658a4d0 Add data unit translations 2024-04-02 17:29:32 +00:00
Earl Warren
a89e146cb0 Merge pull request '[v7.0/forgejo] [FEAT] Mark database errors in tests as failure' (#2978) from bp-v7.0/forgejo-2dabd20 into v7.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2978
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-04-02 15:53:23 +00:00