mirror of
1
Fork 0
Commit Graph

17146 Commits

Author SHA1 Message Date
Earl Warren 4092c544ca Merge pull request '[SEMVER] 6.0.8+0-gitea-1.21.8' () from earl-warren/forgejo:wip-v1.21-semver into v1.21/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2720
2024-03-22 08:32:31 +00:00
Earl Warren 9028d061cc Merge pull request '[gitea] v1.21 cherry-pick' () from earl-warren/forgejo:wip-v1.21-gitea-cherry-pick into v1.21/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2716
2024-03-22 07:41:50 +00:00
Earl Warren 586b5c6459
[SEMVER] 6.0.8+0-gitea-1.21.8 2024-03-22 08:00:05 +01:00
Earl Warren df98757424
Fix invalid link of the commit status when ref is tag () () (step 2)
UpdateRepositoryUnits was moved to repo_service by a refactor that was
not cherry-picked. (Fix schedule tasks bugs () ())
2024-03-21 17:28:36 +01:00
yp05327 2051763969
Fix invalid link of the commit status when ref is tag () ()
Backport 

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit aae96cc62b6e6642fa1ef3dcacb716d32f5652b9)
2024-03-21 17:09:50 +01:00
Giteabot 120a173e24
Fix PR creation via api between branches of same repo with head field namespaced () ()
Backport  by @norohind

Fix 

Current implementation of API does not allow creating pull requests
between branches of the same
repo when you specify *namespace* (owner of the repo) in `head` field in
http request body.

---------

Co-authored-by: norohind <60548839+norohind@users.noreply.github.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 408c92938ba6f38eea1210cae2c485e1f19d4982)
2024-03-21 17:09:50 +01:00
Giteabot ee87a652e9
Editor error message misleading due to re-used key. () ()
Backport  by @buckybytes

The error message:

`editor.file_changed_while_editing = The file contents have changed
since you started editing. <a target="_blank" rel="noopener noreferrer"
href="%s">Click here</a> to see them or <strong>Commit Changes
again</strong> to overwrite them.`

Is re-used in inappropriate contexts. The link in the key goes to a 404
when the key is used in a situation where the file contents have not
changed.

Added two new keys to differentiate commit id mismatch and push out of
date conditions.

Co-authored-by: buckybytes <158571971+buckybytes@users.noreply.github.com>
(cherry picked from commit 00ea9af8e118790a186b4cf78a0ce85ce986bf1d)
2024-03-21 17:09:50 +01:00
Giteabot c060cf0e54
Fix user id column case () ()
Backport  by @lng2020

Sometimes the column name is case-sensitive and it may cause 500.

Co-authored-by: Nanguan Lin <nanguanlin6@gmail.com>
(cherry picked from commit c044510ca8bed67cb2d50ba741b3d0b520aa3c43)
2024-03-21 17:09:50 +01:00
Giteabot 07da773418
fix double border and border-radius on empty action steps () ()
Backport  by @silverwind

Before, double border-bottom and incorrect border-radius:

<img width="914" alt="Screenshot 2024-03-16 at 14 46 31"
src="https://github.com/go-gitea/gitea/assets/115237/6ea63c42-754c-420c-a0f5-c889a8507d9f">

After, both fixed:

<img width="917" alt="Screenshot 2024-03-16 at 14 45 59"
src="https://github.com/go-gitea/gitea/assets/115237/9d3f2dba-6b22-441d-8e99-5809d5f1f1c0">

Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 8242c3c88c43bec4905bd689dbb05f7f64e2c3d7)
2024-03-21 17:09:50 +01:00
6543 a876ac2c79
Make meilisearch do exact search for issues ( & ) ()
Backport https://github.com/go-gitea/gitea/pull/29740 (based on 
...)

(cherry picked from commit 0cbbcf20e3f83413a88fe3d436451d707639fe55)
2024-03-21 17:09:50 +01:00
Giteabot 655302fc96
Fix `for` attribute not pointing to the ID of the color picker () ()
Backport  by @yardenshoham

It didn't include the word picker.

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
(cherry picked from commit 47dc4598a305ea1e6017803b95c7c60d0be64784)
2024-03-21 17:09:50 +01:00
Earl Warren 510b2ff70e
Update Chroma to v2.13.0 () () (step 2)
go mod tidy was missing but compensated in Gitea by another commit merged
afterwards. It is skipped in Forgejo, reason why this is necessary.
2024-03-21 17:09:00 +01:00
Lunny Xiao 1952c3a0a5
Update Chroma to v2.13.0 () ()
Backport 

This adds new lexers and includes some fixes. See
https://github.com/alecthomas/chroma/releases/tag/v2.13.0 for the full
changelog.

Co-authored-by: JakobDev <jakobdev@gmx.de>
(cherry picked from commit 31ab839a6587ea93edfec4d0147282c689d3e312)
2024-03-21 09:38:01 +01:00
Giteabot 6fcea1208d
Fix Safari spinner rendering () ()
Backport  by @silverwind

Fixes: https://github.com/go-gitea/gitea/issues/29041
Fixes: https://github.com/go-gitea/gitea/pull/29713

Any of the `width: *-content` properties seem to workaround this Webkit
bug, this one seemed most suitable.

Before:
<img width="184" alt="Screenshot 2024-03-14 at 22 29 58"
src="https://github.com/go-gitea/gitea/assets/115237/6effc5f0-bc64-4752-be74-9c43b3974407">

After:
<img width="177" alt="Screenshot 2024-03-14 at 22 30 30"
src="https://github.com/go-gitea/gitea/assets/115237/5de244d7-6b46-428e-957c-4b10f53e2441">

Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit df23ec0f8b490bee49dc0e7944b529f3ede35301)
2024-03-21 09:37:30 +01:00
Giteabot 0dcc9b8466
Fix missing translation on milestons () ()
Backport  by @lunny

Caused by 
Fix 

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit e03cf66e8b537430d24665b647b5af5716d182ee)
2024-03-21 09:36:50 +01:00
wxiaoguang b68fa8ee09
Fix incorrect package link method calls in templates () ()
Backport 
Fix 
Fix 
Follow  

(cherry picked from commit bb2640c485071088dd91e47fb510c44e028624fa)
2024-03-21 09:29:05 +01:00
Giteabot 73498c1622
Suppress error from monaco-editor () ()
Backport  by @silverwind

Fixes: https://github.com/go-gitea/gitea/issues/29414

I see no way for us to catch this error, so downgrade it until
https://github.com/microsoft/monaco-editor/issues/4325 is fixed, which
will likely take a few weeks to propagate up from vscode.

The entries in `updates.config.js` will make
[`updates`](https://github.com/silverwind/updates) not upgrade these
anymore and I think it's good documentation as well to have the reasons
why we don't upgrade these dependencies.

Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 462ae88fc2e6295a9376855627ad2a824a6c8f1d)
2024-03-21 09:28:37 +01:00
Giteabot fefe6062b0
Improve CSV rendering () ()
Backport  by @silverwind

Before:

<img width="1332" alt="Screenshot 2024-03-06 at 21 42 17"
src="https://github.com/go-gitea/gitea/assets/115237/0ea07eee-31f8-4783-bd56-37bd8396f00d">

After:
<img width="1336" alt="Screenshot 2024-03-06 at 21 41 58"
src="https://github.com/go-gitea/gitea/assets/115237/eb7f9cc9-587f-4e3b-92bd-cc67ca639963">

Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 12b429c0d151178f1dcdb349dc297fdc9b773364)
2024-03-21 09:25:32 +01:00
Lunny Xiao 02ac89c01d
Use Get but not Post to get actions artifacts () ()
backport 

(cherry picked from commit 8c31456a879797e7247d2cbf65b53fd16939c91d)
2024-03-21 09:25:14 +01:00
Giteabot 4543d70216
Fix inconsistent rendering of block mathematical expressions () ()
Backport  by @yp05327

Fix 

GitHub render `\```math\``` ` as a block now.
Add `display` class will render it as a block.

After:

![image](https://github.com/go-gitea/gitea/assets/18380374/2a1c20c7-438e-4ab1-8c66-cf91c8343087)

![image](https://github.com/go-gitea/gitea/assets/18380374/b81b8a93-8bca-46a5-b7db-e0d2f53e1342)

Co-authored-by: yp05327 <576951401@qq.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 4bfc43ef8de7c5e42f9502aa23075ee5fe04b26b)
2024-03-21 09:24:31 +01:00
Gusted 5fa3381787 Merge pull request '[BUG] Fix manual merge button' () from gusted/forgejo-bp-2696 into v1.21/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2697
Reviewed-by: Otto <otto@codeberg.org>
2024-03-19 19:26:58 +00:00
Gusted c70719c59c
[BUG] Fix manual merge button
- Backport of 
- Add `form-fetch-action` to indicate that this form POST to an link
that returns JSON and thus should be handled by Javascript code.
- Found by @fnetx
- Regression of https://codeberg.org/forgejo/forgejo/pulls/1793

(cherry picked from commit 9551c1a6f8)
2024-03-19 19:43:58 +01:00
oliverpool 0774e04d6b Merge pull request '[GITEA] Enable mocked HTTP responses for GitLab migration test (backport to v1.21)' () from wetneb/forgejo:windows-cloning-v1.21 into v1.21/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2667
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-15 19:19:27 +00:00
Gusted b06e953395 Merge pull request '[BUG] Use correct head commit for CODEOWNER' () from gusted/forgejo-bp-2658 into v1.21/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2672
Reviewed-by: Otto <otto@codeberg.org>
2024-03-15 15:36:38 +00:00
Gusted 02c9304247 Merge pull request '[BUG] Display error message if doer is unable to fork' () from gusted/forgejo-bp-2649 into v1.21/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2671
Reviewed-by: Otto <otto@codeberg.org>
2024-03-15 15:05:53 +00:00
Gusted d1cebb0e88
[BUG] Use correct head commit for CODEOWNER
Backport of 

Regression of , which switched the HEAD from `pr.GetGitRefName()`
to `pr.HeadCommitID` but it had to be `prInfo.HeadCommitID`. Resolves 
I was able to reproduce this locally with _some_ pull requests, haven't
been able to get a reproducer trough integration testing.

(cherry picked from commit a4cc37b46a)
2024-03-15 15:43:37 +01:00
Shiny Nematoda 730cc56080
[BUG] Display error message if doer is unable to fork
- Backport of 
- Resolves 

(cherry picked from commit 773048afa1)
2024-03-15 15:14:28 +01:00
Antonin Delpeuch f609d00e1b [GITEA] Enable mocked HTTP responses for GitLab migration test 2024-03-15 12:58:50 +01:00
Earl Warren bd71bdda26 Merge pull request '[gitea] v1.21 cherry-pick' () from earl-warren/forgejo:wip-v1.21-gitea-cherry-pick into v1.21/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2621
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-03-12 23:17:05 +00:00
oliverpool d9418651af [BUG 1.21] prevent error 500 on /user/settings/security when SignedUser has a linked account from a deactivated authentication source ()
This should fix .

This has apparently be fixed in `main` https://github.com/go-gitea/gitea/pull/27798 (but quite a big PR, which was not backported). I should likely push the test to the main branch as well.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2626
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: oliverpool <git@olivier.pfad.fr>
Co-committed-by: oliverpool <git@olivier.pfad.fr>
2024-03-11 14:10:51 +00:00
silverwind 4f9b761a06
Don't show AbortErrors on logout () ()
Backport https://github.com/go-gitea/gitea/pull/29639.

When logging out of Gitea, a error toast can be seen for a split second.
I don't know why or how it happens but I found it it's an `AbortError`
(related to
[AbortController#abort](https://developer.mozilla.org/en-US/docs/Web/API/AbortController/abort)),
so let's hide it.

(cherry picked from commit 346b66230519955fc831e75a9cc6175621d63b02)
2024-03-10 18:45:59 +07:00
Giteabot ac05e205ba
Use more specific selector for `name` links () ()
Backport  by @silverwind

Followup https://github.com/go-gitea/gitea/pull/29305. As per discussion
in https://github.com/go-gitea/gitea/pull/29666#discussion_r1517506422,
make this selector only search in the current `.markup` document, as
there can be multiples displayed at the same time.

@DanielMatiasCarvalho maybe you can review.

Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 25b0c99a41e9024d439deaa55be7ba87f6cd557f)
2024-03-10 18:45:59 +07:00
Giteabot 03caefbb02
Fix user-defined markup links targets () ()
Backport  by @DanielMatiasCarvalho

This seeks to fix the bug reported on issue .

Cause:
ID's with custom characters (- , _ , etc.), were not linking correctly
in the Markdown file when rendered in the browser because the ID in the
respective destinies would be different than the one in anchor, while
for IDs with only letters, the ID would be the same.

Fix:
It was suggested that to fix this bug, it should more or less like
GitHub does it. While in gitea the anchors would be put in HTML like
this:
```
<p dir="auto"><a href="#user-content-_toc152597800" rel="nofollow">Review</a></p>
<p dir="auto"><a href="#user-content-_toc152597802" rel="nofollow">Staging</a></p>
<p dir="auto"><a href="#user-content-_toc152597803" rel="nofollow">Development</a></p>
<p dir="auto"><a href="#user-content-_toc152597828" rel="nofollow">Testing</a></p>
<p dir="auto"><a href="#user-content-_toc152597829" rel="nofollow">Unit-tests</a></p>

```
In GitHub, the same anchor's href properties would be the same without
"user-content-" trailing behind.

So my code made sure to change those anchors, so it would not include
"user-content-" and then add respective Event Listeners so it would
scroll into the supposed places.

Fixes: 

Co-authored-by: DC <106393991+DanielMatiasCarvalho@users.noreply.github.com>
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit bfc7c8a5985825ec28f3feefe1d050ec52525097)
2024-03-10 18:45:59 +07:00
Giteabot e811f3b185
Fix commit_status problem when testing () ()
Backport  by @charles7668

Close 

fix 

Co-authored-by: charles <30816317+charles7668@users.noreply.github.com>
(cherry picked from commit 1f897637441a9a5c43e01b84e374d836d9260a00)
2024-03-10 18:45:59 +07:00
Lunny Xiao 66061d2828
Fix 500 when deleting account with incorrect password or unsupported login type () ()
Fix 
Backport 

Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit a129c0c06c91e4994244138687be135dddd4c00d)
2024-03-10 18:45:59 +07:00
Giteabot e151e04673
Fix incorrect rendering csv file when file size is larger than UI.CSV.MaxFileSize () ()
Backport  by @yp05327

Fix 

Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit 6651d2d87aa4af96bf2c992e3ecae6a290d07496)
2024-03-10 18:45:59 +07:00
Giteabot bd0978ce72
Fixing the issue when status check per rule matches multiple actions () ()
Backport  by @charles7668

Close 
rule
```
Test / Build*
Test / Build *
Test / Build 2*
Test / Build 1*
```

![image](https://github.com/go-gitea/gitea/assets/30816317/19bef0a9-fa97-43c5-887b-dece76064aa8)
rule2
```
Test / Build*
Test / Build 1*
```

![image](https://github.com/go-gitea/gitea/assets/30816317/19bef0a9-fa97-43c5-887b-dece76064aa8)

rule3
```
Test / Build*
Test / Build 1*
NotExist*
```

![image](https://github.com/go-gitea/gitea/assets/30816317/f6a5e832-2e1b-4049-915b-45bec5ef070c)

Co-authored-by: charles <30816317+charles7668@users.noreply.github.com>
Co-authored-by: Zettat123 <zettat123@gmail.com>
(cherry picked from commit 76b6754c3a42e6f1d675fe9f9d66a65954cb85d1)
2024-03-10 18:45:59 +07:00
silverwind 43df4755a3
Update Twitter Logo () ()
Backport https://github.com/go-gitea/gitea/pull/29621
<img width="430" alt="image"

src="https://github.com/go-gitea/gitea/assets/115237/9cf7b0a3-406b-4dd6-ab3d-d31a96b9335a">

(cherry picked from commit b6a2b9594af06698b29ea4c649b85e40c7f4b82d)
2024-03-10 18:45:59 +07:00
Giteabot 9230e8d035
Avoid issue info panic () ()
Backport  by wxiaoguang

Fix 

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 6ee58a0ac20fa1e7d328ede71f3df4c86fc41ab3)
2024-03-10 18:45:59 +07:00
wxiaoguang 7a32382108
Avoid unexpected panic in graceful manager () ()
Backport 

(cherry picked from commit 2f1eb619bc19a9b172062ba17789356bbdaa259d)
2024-03-10 18:45:59 +07:00
Giteabot 9f7a51d3d7
Fix wrong line number in code search result () ()
Backport  by @yp05327

Fix 

Before:
The result is a table and all line numbers are all in one row.

![image](https://github.com/go-gitea/gitea/assets/18380374/7a18b354-e257-4f57-a5ca-f6d37378edf6)

![image](https://github.com/go-gitea/gitea/assets/18380374/98416e11-89b5-4b4f-920b-91bcf041a87f)

After:

![image](https://github.com/go-gitea/gitea/assets/18380374/f189e436-9046-4431-926a-cd0deb58e8f1)

![image](https://github.com/go-gitea/gitea/assets/18380374/07d213ed-2401-4b7f-b951-5df7dc776af4)

~~Updated:~~
~~added `active` class to the target line.~~

![image](https://github.com/go-gitea/gitea/assets/18380374/0b274e48-048a-4c66-ba95-df515212ec08)

Co-authored-by: yp05327 <576951401@qq.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 9db426ad8c7122633fa3e31a427fd1e65ddad334)
2024-03-10 18:45:59 +07:00
Giteabot b76f370a3f
Fix 500 when pushing release to an empty repo () ()
Backport  by @lng2020

As title.
The former code directly used `ctx.Repo.GitRepo`, causing 500.

22b4f0c09f/routers/api/v1/repo/release.go (L241)

Co-authored-by: Nanguan Lin <nanguanlin6@gmail.com>
(cherry picked from commit b84303ef6e73e2436f0c4c3985020be6bbbb5d1e)
2024-03-10 18:45:59 +07:00
wxiaoguang ecc0107809
Only use supported sort order for "explore/users" page () ()
Backport 

Thanks to inferenceus : some sort orders on the "explore/users" page
could list users by their lastlogintime/updatetime.

It leaks user's activity unintentionally. This PR makes that page only
use "supported" sort orders.

Removing the "sort orders" could also be a good solution, while IMO at
the moment keeping the "create time" and "name" orders is also fine, in
case some users would like to find a target user in the search result,
the "sort order" might help.

(cherry picked from commit 2b059f493e46b8b0fb52492623e36a8375cb5fbb)
2024-03-10 18:45:59 +07:00
Giteabot 19c5642971
Fix incorrect cookie path for AppSubURL () ()
Backport 
Regression of 

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 5ca2971ccbc8769f7e6ee41c125db47f818e7599)
2024-03-10 18:45:59 +07:00
Giteabot 446d7bd7a7
Fix incorrect redirection when creating a PR fails () ()
Backport  by wxiaoguang

This is only a quick fix to make it easier to backport.

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 971eab18fa0b29312105df739fba443cf9e84d50)
2024-03-10 18:45:59 +07:00
Giteabot 52f52f60f1
Fix queue worker incorrectly stopped when there are still more items in the queue () ()
Backport 

Without `case <-t.C`, the workers would stop incorrectly, the test won't
pass. For the worse case, there might be only one running worker
processing the queue items for long time because other workers are
stopped. The root cause is related to the logic of doDispatchBatchToWorker.
It isn't a serious problem at the moment, so keep it as-is.

(cherry picked from commit 86cd94cba6d63c84528f6f8d52b1ec22b44ac2f8)
2024-03-10 18:45:59 +07:00
Giteabot 1a65ecb867
Fix incorrect relative/absolute URL usages () ()
Backport  by wxiaoguang

Add two "HTMLURL" methods for PackageDescriptor.
And rename "FullWebLink" to "VersionWebLink"

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 8723389028bcb5e96359fca61efd7d6da0d6af99)
2024-03-10 18:45:59 +07:00
Giteabot 22419d9f8d
Fix incorrect subpath in links () ()
Backport  by wxiaoguang

* `$referenceUrl`: it is constructed by "Issue.Link", which already has
the "AppSubURL"
* `window.location.href`: AppSubURL could be empty string, so it needs
the trailing slash

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 401cc394d52c6126d3cbca1e1367c4e4da5110f9)
2024-03-10 18:45:59 +07:00
Giteabot e6441a18d2
Fix issue link does not support quotes () () ()
Backport  by @charles7668

Close 

![圖片](https://github.com/go-gitea/gitea/assets/30816317/b27e6e16-67e0-469c-8e04-30180c585890)

Co-authored-by: charles <30816317+charles7668@users.noreply.github.com>
(cherry picked from commit 3a8877c058fd8583f28711750cf26716526200c4)
2024-03-10 18:45:59 +07:00
Giteabot 5099d3c747
Set pre-step status to `skipped` if job is skipped () ()
Backport  by @sillyguodong

close 
1. Set pre-step (Set up job) status to `skipped` if job is skipped.
2. Apart from pre-step, the other steps should also be set to `skipped`.
The status of other steps are reported from the runner side. This will
be completed by this PR: https://gitea.com/gitea/act_runner/pulls/500

before:

![image](https://github.com/go-gitea/gitea/assets/33891828/4bac2ba9-66de-4679-b7ed-fbae459c0c54)

after:

![image](https://github.com/go-gitea/gitea/assets/33891828/ead4871a-4e0f-4bb1-9fb4-37f4fdb78dfc)

Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
(cherry picked from commit 8d085587831d1357ae80046fe0627dbcc8657a79)
2024-03-10 18:45:58 +07:00