Earl Warren
48c962343e
Merge pull request '[Feat]Count downloads for tag archives' ( #2976 ) from JakobDev/forgejo:archivecount into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2976
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-08 13:39:11 +00:00
Earl Warren
7e5cf471a0
Merge pull request '[PORT] gitea#30190: Add unique index for project_issue to prevent duplicate data' ( #3096 ) from gusted/forgejo-gt-30190 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3096
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-04-08 13:30:11 +00:00
JakobDev
94d4b241b3
Resolve conflicts
2024-04-08 12:55:05 +02:00
JakobDev
ffbe89ec2e
Update Frontend
2024-04-08 12:54:43 +02:00
JakobDev
a610e93cc9
Add fix and migration
2024-04-08 12:54:43 +02:00
JakobDev
613e5387c5
Count downloads for tag archives
2024-04-08 12:51:27 +02:00
Earl Warren
f8a5d6872c
Merge pull request '[PORT] gitea#29953: Fix:the rounded corners of the folded file are not displayed correctly' ( #3102 ) from algernon/forgejo:gitea/port/29953 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3102
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-04-08 09:26:34 +00:00
Earl Warren
b7303cd3b5
Merge pull request 'Run Renovate more often' ( #3108 ) from viceice/forgejo:chore/renovate-settings into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3108
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-08 08:11:32 +00:00
Michael Kriese
cca2141078
Run Renovate more often
2024-04-08 09:19:58 +02:00
Earl Warren
cc1ea0b0b0
Merge pull request 'Fix renovate cache' ( #3106 ) from viceice/forgejo:chore/renovate-cache-fix into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3106
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-08 07:15:08 +00:00
Michael Kriese
ad9af34f99
Fix renovate cache
2024-04-08 08:47:02 +02:00
Earl Warren
1830df1922
Merge pull request '[PORT] gitea#30279: Update JS dependencies and add new eslint rules' ( #3097 ) from gusted/forgejo-gt-30279 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3097
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-08 05:51:12 +00:00
Earl Warren
6b5236a359
Merge pull request '[PORT] gitea#30282: Markup color and font size fixes' ( #3099 ) from gusted/forgejo-gt-30282 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3099
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-07 19:52:58 +00:00
Earl Warren
ba2cd8ee64
Merge pull request '[BUG] Fix unblock action' ( #3086 ) from gusted/forgejo-unblock into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3086
2024-04-07 15:33:51 +00:00
HEREYUA
43122ca984
Fix:the rounded corners of the folded file are not displayed correctly ( #29953 )
...
Fix: [#29933 ](https://github.com/go-gitea/gitea/issues/29933 )
**Before**
![image](https://github.com/go-gitea/gitea/assets/37935145/71ec80f6-5896-4e4a-b686-4d792c11ebe2 )
**After**
![image](https://github.com/go-gitea/gitea/assets/37935145/81348a61-946a-4562-881d-8d873e50228f )
---------
Co-authored-by: silverwind <me@silverwind.io>
Conflicts:
- web_src/css/modules/segment.css
Ported by adding the new selector with a larger radius,
keeping the existing one with ours.
2024-04-07 16:37:36 +02:00
silverwind
ff1744cbbc
[PORT] gitea#30282: Markup color and font size fixes
...
1. Distinguish inline an block code with new CSS variable
`--color-markup-code-inline`
2. Various color tweaks, better contrast from background
(cherry picked from commit 662eb4b0852f9ce2c161e7fea5ac66bf912fc9f6)
---
- Revert the changes of #2874 .
- Add more contrast to the inline block for light and dark theme.
(cherry picked from commit 662eb4b0852f9ce2c161e7fea5ac66bf912fc9f6)
2024-04-07 15:16:22 +02:00
silverwind
e875220edd
[PORT] gitea#30279: Update JS dependencies and add new eslint rules
...
- Run `make update-js`
- Added new eslint rules
- Tested webpack build and swagger ui
---
Conflict resolution:
- package.json for minimatch choose the newest favor.
- package-lock.json, run `npm install` to generate this.
(cherry picked from commit 5dabc679aa0a33bc1b997335a216acfe97e70ea5)
2024-04-07 15:05:08 +02:00
Lunny Xiao
f0004760f6
[PORT] gitea#30190: Add unique index for project_issue to prevent duplicate data
...
Fix #27639
---
Remove MSSQL specific code per https://codeberg.org/forgejo/discussions/issues/122
(cherry picked from commit b4825670596fe745cebdcc63a8ead4388602d42c)
2024-04-07 14:51:50 +02:00
Gusted
efc2f53954
Merge pull request '[BUG] Fix tone of callout boxes for Forgejo dark' ( #3085 ) from gusted/forgejo-theme-contrast into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3085
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-07 11:49:05 +00:00
Earl Warren
e70e93c4b4
Merge pull request '[BUG] Fix admin layout' ( #3087 ) from gusted/forgejo-admin-layout into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3087
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-04-06 20:39:01 +00:00
TheFox0x7
5f05196915
Add vars context to cron jobs ( #3059 )
...
Introduce vars context into cron triggered actions
Fixes #3044
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3059
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: TheFox0x7 <thefox0x7@gmail.com>
Co-committed-by: TheFox0x7 <thefox0x7@gmail.com>
2024-04-06 19:54:53 +00:00
Gusted
c2d0f64340
[BUG] Fix admin layout
...
- Fix the layout of admin pages, it previously was full-width and had
the alert at the incorrect place and within an container.
- Make the placement of the alert consistent with other pages, inside
`flex-container-main` and not wrapped around a container.
- We have to revert 145bebc829
, as this
expected that the page contain provided padding, this was provided by
the incorrect placement of the alert. As well isn't consistent with how
other pages are being shown, non-full width. The solution to the
described problem isn't optimal and should rather be fixed with the tables.
- Reverts 145bebc829
- Resolves #3082
2024-04-06 21:23:50 +02:00
Gusted
a3f1249f0a
[BUG] Fix unblock action
...
- At some point the unblock button was transformed into being handled by
Javascript, however the endpoint didn't yet respond in JSON.
- Ref: https://codeberg.org/kita/.profile/raw/branch/main/img/G94IqS9.png
2024-04-06 20:57:51 +02:00
Gusted
515ccaacd9
[BUG] Fix tone of callout boxes for Forgejo dark
...
- Adjust the warning and success text to be more representive (make them
more green and yellow). They still confirm to AAA contrast.
- For important, note and caution callout boxes make use of the light
variants for the colors colors rather than the dark variant.
- Resolves #3084
2024-04-06 20:38:37 +02:00
Gusted
d9f6c59543
Merge pull request 'Add unit tests for update git hook' ( #3081 ) from gusted/forgejo-hook-test into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3081
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-04-06 17:38:17 +00:00
Gusted
dad799fa46
Add unit tests for update git hook
...
- Add unit tests.
- Handle the 'impossible' case of not enough arguments.
- Ref: https://codeberg.org/forgejo/forgejo/pulls/2834
2024-04-06 17:01:33 +02:00
Shiny Nematoda
baac15f316
[FEAT] Support Include/Exclude Filters for Grep ( #3058 )
...
fixes `TestRepoSearch` failing occasionally
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3058
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
Co-committed-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
2024-04-06 13:25:39 +00:00
Gusted
0a51ae26bc
Merge pull request 'Sort `BuiltinApplicationsClientIDs()` in test' ( #3075 ) from gusted/forgejo-sort into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3075
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-04-06 12:43:42 +00:00
Gusted
5691becace
Merge pull request 'Fix "view file" button in diff compare view' ( #3046 ) from Mai-Lapyst/forgejo:fix-diffcompare-viewfile-url into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3046
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-06 12:25:12 +00:00
Gusted
d8eebe7698
Merge pull request 'Add optional pronoun field in user settings' ( #1518 ) from hazy/forgejo:feat/pronoun-field into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1518
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
2024-04-06 12:23:54 +00:00
Gusted
d5fd40821e
Merge pull request 'feat: extend webfinger to respond to profile page URIs' ( #2883 ) from realaravinth/forgejo:cb-2870 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2883
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-06 12:21:35 +00:00
Earl Warren
ec973ee6c3
Merge pull request '[PORT] Refactor dropzone ( #30232 )' ( #3048 ) from earl-warren/forgejo:wip-repo-legacy into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3048
Reviewed-by: Mai-Lapyst <mai-lapyst@noreply.codeberg.org>
2024-04-06 09:56:32 +00:00
Gusted
eea259055e
Sort `BuiltinApplicationsClientIDs()` in test
...
- Ref https://codeberg.org/forgejo/forgejo/pulls/3069#issuecomment-1736290
2024-04-06 11:30:02 +02:00
Mai-Lapyst
ca8479c681
Update integration test
2024-04-06 11:19:32 +02:00
Earl Warren
3093f8765f
Merge pull request 'Fix #3030 add Cache-Control header for health-check' ( #3060 ) from adaaa/forgejo:cache-control-healthz into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3060
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-06 08:09:39 +00:00
Earl Warren
6077d10be3
Merge pull request 'feat: improve nuget nuspec api' ( #2996 ) from viceice/forgejo:feat/nuget/nuspec-api into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2996
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-06 07:48:31 +00:00
Earl Warren
668edc1948
Merge pull request 'Refactor LFS GC functions' ( #3056 ) from gusted/forgejo-lfs into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3056
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-06 07:27:22 +00:00
Earl Warren
a015ada29a
Merge pull request '[BUG] fix webhook creation payload ref' ( #3055 ) from oliverpool/forgejo:webhook_fix_create_payload_ref into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3055
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-06 07:25:20 +00:00
Earl Warren
dbdab1bc60
Merge pull request 'Update bitnami/minio Docker tag to v2024.3.30' ( #2917 ) from renovate/bitnami-minio-2024.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2917
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-04-06 07:20:08 +00:00
Earl Warren
8595e251a2
Merge pull request '[BUG] Don't remove builtin OAuth2 applications' ( #3067 ) from gusted/forgejo-db-consistency-oauth2 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3067
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-06 07:02:07 +00:00
oliverpool
adc5dd0520
Merge pull request '[CHORE] Remove u2f dependency' ( #3057 ) from gusted/forgejo-rm-u2f into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3057
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-04-06 06:14:45 +00:00
Gusted
6af8f3a3f2
[BUG] Don't remove builtin OAuth2 applications
...
- When the database consistency is being run it would check for any
OAuth2 applications that don't have an existing user. However there are
few special OAuth2 applications that don't have an user set, because
they are global applications.
- This was not taken into account by the database consistency checker
and were removed if the database consistency check was being run with
autofix enabled.
- Take into account to ignore these global OAuth2 applications when
running the database consistency check.
- Add unit tests.
- Ref: https://codeberg.org/Codeberg/Community/issues/1530
2024-04-06 01:07:45 +02:00
Ada
323d7ad507
Remove useless t.run
2024-04-06 00:43:22 +02:00
Ada
84f5115bd1
Add health-check test
2024-04-06 00:34:55 +02:00
Michael Kriese
bc72fd7f46
feat: improve nuget nuspec api
2024-04-05 23:39:45 +02:00
Earl Warren
af47c583b4
Merge pull request '[CHORE] Remove Gitea specific files' ( #3039 ) from gusted/forgejo-rm-gitea into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3039
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-04-05 20:40:12 +00:00
Ada
d2ff8f8720
Remove old proxy backwards compatibility
2024-04-05 22:08:22 +02:00
Earl Warren
8205ed9495
Merge pull request '[FEAT] sourcehut webhooks' ( #3022 ) from oliverpool/forgejo:webhook_7_sourcehut into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3022
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-04-05 19:23:54 +00:00
Ada
b210a3ebd5
Fix #3030 add Cache-Control header for health-check
2024-04-05 18:44:17 +02:00
Gusted
5ae3098faa
Merge pull request 'Update dependency @stoplight/spectral-cli to v6.11.1' ( #3049 ) from renovate/stoplight-spectral-cli-6.x into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3049
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-04-05 14:50:15 +00:00