oliverpool
4ad42a4e3f
[REFACTOR] webhook shared code to prevent import cycles
...
(cherry picked from commit 04a398a1af
)
2024-04-05 19:36:03 +00:00
Earl Warren
be41258d5c
Merge pull request '[v7.0/forgejo] Provide plural support for followers/following in user profiles' ( #3053 ) from bp-v7.0/forgejo-ddedcd4-df2a83e into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3053
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-04-05 09:35:25 +00:00
Earl Warren
fe8b34b8fc
Merge pull request 'Mark deprecation of MSSQL' ( #3041 ) from gusted/forgejo-deprecate-mssql into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3041
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-05 06:46:08 +00:00
Earl Warren
f5cd6339a8
Merge pull request '[v7.0/forgejo] Revert "[CI] pin go v1.22.2 version"' ( #3051 ) from bp-v7.0/forgejo-2625335 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3051
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-05 06:43:22 +00:00
0ko
68476e2494
Use people icon instead of person on profiles
...
(cherry picked from commit ddedcd44b7
)
2024-04-05 06:32:11 +00:00
0ko
04ea1aedc5
[I18N] Provide plural support for followers/following in user profiles
...
(cherry picked from commit df2a83ed20
)
2024-04-05 06:32:11 +00:00
Earl Warren
2ed0a56dd4
Merge pull request '[v7.0/forgejo] [I18N] Translations update from Weblate' ( #3052 ) from bp-v7.0/forgejo-2c69ca4 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3052
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-05 06:20:40 +00:00
Codeberg Translate
1f0e36f7ae
[I18N] Translations update from Weblate ( #2982 )
...
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: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: Eriwi <Eriwi@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: Salif Mehmed <mail@salif.eu>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: FedericoSchonborn <FedericoSchonborn@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2982
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>
(cherry picked from commit 2c69ca43f5
)
2024-04-05 04:58:22 +00:00
Earl Warren
af797534f8
Merge pull request '[v7.0/forgejo] Fixes regression of issue edit not working' ( #3047 ) from bp-v7.0/forgejo-8c31b78 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3047
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-05 04:56:38 +00:00
Earl Warren
5374cb6608
Revert "[CI] pin go v1.22.2 version"
...
The golang action now knows about the latest Go version.
This reverts commit 3509242ee6
.
(cherry picked from commit 262533570f
)
2024-04-05 04:40:24 +00:00
Mai-Lapyst
84d8c8b777
Fixes regression of issue edit not working
...
(cherry picked from commit 8c31b78630
)
2024-04-05 04:03:20 +00:00
Gusted
c65b9e0112
Mark depreciation of MSSQL
...
- Per https://codeberg.org/forgejo/discussions/issues/122
2024-04-04 22:27:56 +02:00
Earl Warren
2024519bb4
Merge pull request '[v7.0/forgejo] [FEAT] Add label filters in organization issues dashboard' ( #3038 ) from bp-v7.0/forgejo-8d13ed4 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3038
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-04 19:41:54 +00:00
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
iminfinity
cb0c6b52be
add label filters in org/{org_name}/issues
...
(cherry picked from commit 8d13ed4a8d
)
2024-04-04 17:37:56 +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