]> source.dussan.org Git - gitea.git/log
gitea.git
2 months agoRemove unneccessary uses of `word-break: break-all` (#31637) (#31652)
Giteabot [Thu, 18 Jul 2024 10:58:11 +0000 (18:58 +0800)]
Remove unneccessary uses of `word-break: break-all` (#31637) (#31652)

Backport #31637 by @silverwind

Fixes: https://github.com/go-gitea/gitea/issues/31636
1. Issue sidebar topic is disussed in
https://github.com/go-gitea/gitea/issues/31636
2. Org description already has `overflow-wrap: anywhere` to ensure no
overflow.

Co-authored-by: silverwind <me@silverwind.io>
3 months agoFix: Allow org team names of length 255 in create team form (#31564) (#31603)
Giteabot [Wed, 10 Jul 2024 16:28:27 +0000 (00:28 +0800)]
Fix: Allow org team names of length 255 in create team form (#31564) (#31603)

Backport #31564 by @tobiasbp

Gitea 1.22.1 was supposed to allow for team names of length 255 (up from
30) after the following PR was merged in:
https://github.com/go-gitea/gitea/pull/31410. However, the length of
team names was still limited to 30 as described in this issue:
https://github.com/go-gitea/gitea/issues/31554.

One more change to _gitea_ needs to be made to allow for the longer team
names, as there is a 30 character limit here:
https://github.com/go-gitea/gitea/blob/2c92c7c5226e29636a1d47a277130f477fa2037b/services/forms/org.go#L65

This PR changes that value to 255.

Co-authored-by: Tobias Balle-Petersen <tobias.petersen@unity3d.com>
3 months agoUse old behavior for telegram webhook (#31588)
wxiaoguang [Tue, 9 Jul 2024 03:23:33 +0000 (11:23 +0800)]
Use old behavior for telegram webhook (#31588)

Fix #31182

3 months agoReturn an empty string when a repo has no avatar in the repo API (#31187) (#31567)
Jimmy Praet [Fri, 5 Jul 2024 12:40:45 +0000 (14:40 +0200)]
Return an empty string when a repo has no avatar in the repo API (#31187) (#31567)

Backport #31187

Resolves #31167.

https://github.com/go-gitea/gitea/pull/30885 changed the behavior of
`repo.AvatarLink()` where it can now take the empty string and append it
to the app data URL. This does not point to a valid avatar image URL,
and, as the issue mentions, previous Gitea versions returned the empty
string.

Co-authored-by: Kemal Zebari <60799661+kemzeb@users.noreply.github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
3 months agoFix slow patch checking with commits that add or remove many files (#31548) (#31560)
Giteabot [Fri, 5 Jul 2024 09:24:01 +0000 (17:24 +0800)]
Fix slow patch checking with commits that add or remove many files (#31548) (#31560)

Backport #31548 by @brechtvl

Running git update-index for every individual file is slow, so add and
remove everything with a single git command.

When such a big commit lands in the default branch, it could cause PR
creation and patch checking for all open PRs to be slow, or time out
entirely. For example, a commit that removes 1383 files was measured to
take more than 60 seconds and timed out. With this change checking took
about a second.

This is related to #27967, though this will not help with commits that
change many lines in few files.

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
3 months agoAdd changelog for 1.22.1 (#31517) v1.22.1
Lunny Xiao [Thu, 4 Jul 2024 02:17:07 +0000 (10:17 +0800)]
Add changelog for 1.22.1 (#31517)

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
3 months agoUpdate `golang.org/x/image` to v0.18.0 (#31542)
silverwind [Tue, 2 Jul 2024 23:42:16 +0000 (01:42 +0200)]
Update `golang.org/x/image` to v0.18.0 (#31542)

3 months agoremove typo (#31524)
rayden84 [Sat, 29 Jun 2024 15:54:15 +0000 (17:54 +0200)]
remove typo (#31524)

3 months agoFix avatar radius problem on the new issue page (#31506) (#31508)
Giteabot [Thu, 27 Jun 2024 15:34:40 +0000 (23:34 +0800)]
Fix avatar radius problem on the new issue page (#31506) (#31508)

Backport #31506 by charles7668

Co-authored-by: charles <30816317+charles7668@users.noreply.github.com>
3 months agouse correct l10n string (#31487) (#31490)
Giteabot [Wed, 26 Jun 2024 13:45:48 +0000 (21:45 +0800)]
use correct l10n string (#31487) (#31490)

Backport #31487 by CyberFlameGO

Co-authored-by: CyberFlame <cyberflameu@gmail.com>
3 months agoUpgrade `github.com/hashicorp/go-retryablehttp` (#31499)
silverwind [Wed, 26 Jun 2024 13:15:42 +0000 (15:15 +0200)]
Upgrade `github.com/hashicorp/go-retryablehttp` (#31499)

3 months agoFix dropzone JS error when attachment is disabled (#31486)
wxiaoguang [Wed, 26 Jun 2024 10:09:25 +0000 (18:09 +0800)]
Fix dropzone JS error when attachment is disabled (#31486)

Fix #31485

3 months agoFix overflow menu flickering on mobile (#31484) (#31488)
Giteabot [Tue, 25 Jun 2024 17:13:04 +0000 (01:13 +0800)]
Fix overflow menu flickering on mobile (#31484) (#31488)

Backport #31484 by brechtvl

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
3 months agoFix poor table column width due to breaking words (#31473) (#31477)
Giteabot [Tue, 25 Jun 2024 00:00:17 +0000 (08:00 +0800)]
Fix poor table column width due to breaking words (#31473) (#31477)

Backport #31473 by brechtvl

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
Co-authored-by: silverwind <me@silverwind.io>
3 months agoFix deprecated Dockerfile ENV format (#31450) (#31452)
Giteabot [Mon, 24 Jun 2024 00:53:37 +0000 (08:53 +0800)]
Fix deprecated Dockerfile ENV format (#31450) (#31452)

Backport #31450 by @silverwind

See
https://docs.docker.com/reference/build-checks/legacy-key-value-format/.
Fixes these warnings seen during the docker build:

```
 4 warnings found (use --debug to expand):
 - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 5)
 - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 9)
 - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 75)
 - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 76)
 ```

Introduced in: https://github.com/moby/buildkit/pull/4923

Co-authored-by: silverwind <me@silverwind.io>
3 months agoFix web notification icon not updated once you read all notifications (#31447) (...
Giteabot [Sun, 23 Jun 2024 16:08:37 +0000 (00:08 +0800)]
Fix web notification icon not updated once you read all notifications (#31447) (#31466)

Backport #31447 by kiatt210

Fix #29065
Remove status filtering from GetUIDsAndNotificationCounts sql.

Co-authored-by: kiatt210 <40639725+kiatt210@users.noreply.github.com>
Co-authored-by: kiatt210 <kiatt210@github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
3 months agoSwitch to upstream of `gorilla/feeds` (#31400) (#31464)
techknowlogick [Sun, 23 Jun 2024 08:47:43 +0000 (04:47 -0400)]
Switch to upstream of `gorilla/feeds` (#31400) (#31464)

backport #31400

3 months agoSwitch to "Write" tab when edit comment again (#31445) (#31461)
Giteabot [Sat, 22 Jun 2024 15:47:36 +0000 (23:47 +0800)]
Switch to "Write" tab when edit comment again (#31445) (#31461)

Backport #31445 by wxiaoguang

Fix #19031

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
3 months agoSupport relative paths to videos from Wiki pages (#31061) (#31453)
Giteabot [Fri, 21 Jun 2024 21:03:31 +0000 (05:03 +0800)]
Support relative paths to videos from Wiki pages (#31061) (#31453)

Backport #31061 by @sergeyvfx

This change fixes cases when a Wiki page refers to a video stored in the
Wiki repository using relative path. It follows the similar case which
has been already implemented for images.

Test plan:
- Create repository and Wiki page
- Clone the Wiki repository
- Add video to it, say `video.mp4`
- Modify the markdown file to refer to the video using `<video
src="video.mp4">`
- Commit the Wiki page
- Observe that the video is properly displayed

Co-authored-by: Sergey Sharybin <sergey.vfx@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
3 months agoFix the link for .git-blame-ignore-revs bypass (#31432) (#31442)
Giteabot [Fri, 21 Jun 2024 06:47:11 +0000 (14:47 +0800)]
Fix the link for .git-blame-ignore-revs bypass (#31432) (#31442)

Backport #31432 by wxiaoguang

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
3 months agoFix the wrong line number in the diff view page when expanded twice. (#31431) (#31440)
Giteabot [Thu, 20 Jun 2024 20:33:51 +0000 (04:33 +0800)]
Fix the wrong line number in the diff view page when expanded twice. (#31431) (#31440)

Backport #31431 by @charles7668

close #31149

The problem is caused by the `data-query=` string affecting the parsing
of the `last_left` parameter. When the page is first rendered,
`data-query=` does not exist. However, after clicking expand, the
returned HTML contains this string, causing the line numbers to start
from 1 upon expanding a second time.

before fix

![圖片](https://github.com/go-gitea/gitea/assets/30816317/36842bde-cc30-43ba-91b0-c60a50a6dc0f)

after fix

![圖片](https://github.com/go-gitea/gitea/assets/30816317/b73d7e40-ec01-48ae-9992-09c19ee477ad)

Co-authored-by: charles <30816317+charles7668@users.noreply.github.com>
3 months agoFix labels and projects menu overflow on issue page (#31435) (#31439)
Giteabot [Thu, 20 Jun 2024 16:59:49 +0000 (00:59 +0800)]
Fix labels and projects menu overflow on issue page (#31435) (#31439)

Backport #31435 by brechtvl

It was correct only on the new issue page.

Resolves #31415

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
3 months ago[Fix] Account Linking UpdateMigrationsByType (#31428) (#31434)
Giteabot [Thu, 20 Jun 2024 13:53:15 +0000 (21:53 +0800)]
[Fix] Account Linking UpdateMigrationsByType  (#31428) (#31434)

Backport #31428 by Sumit189

Co-authored-by: Sumit <sumit.18.paul@gmail.com>
3 months agoFix markdown math brackets render problem (#31420) (#31430)
Giteabot [Thu, 20 Jun 2024 09:45:08 +0000 (17:45 +0800)]
Fix markdown math brackets render problem (#31420) (#31430)

Backport #31420 by charles7668

Co-authored-by: charles <30816317+charles7668@users.noreply.github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
3 months agoIncrease max length of org team names from 30 to 255 characters (#31410) (#31421)
Giteabot [Thu, 20 Jun 2024 01:27:13 +0000 (09:27 +0800)]
Increase max length of org team names from 30 to 255 characters (#31410) (#31421)

Backport #31410 by tobiasbp

This PR modifies the structs for editing and creating org teams to allow
team names to be up to 255 characters. The previous maximum length was
30 characters.

Co-authored-by: Tobias Balle-Petersen <tobias.petersen@unity3d.com>
3 months agoFix new issue/pr avatar (#31419) (#31424)
Giteabot [Wed, 19 Jun 2024 21:18:10 +0000 (05:18 +0800)]
Fix new issue/pr avatar (#31419) (#31424)

Backport #31419 by @silverwind

The avatar on "New Issue" and "New Pull Request" pages was inconsistent.
Removed the extra margin and the new CSS rules now use common parent
`<form id="#new-issue">` because `.repository.new.issue` is not present
on pull request page.

Before:

<img width="181" alt="Screenshot 2024-06-19 at 13 56 17"
src="https://github.com/go-gitea/gitea/assets/115237/5270d352-db5b-45b3-9d06-4790c17ae9b4">
<img width="213" alt="Screenshot 2024-06-19 at 13 54 02"
src="https://github.com/go-gitea/gitea/assets/115237/012f5607-aef0-4f48-90e3-8d4022480203">

After:

<img width="195" alt="Screenshot 2024-06-19 at 13 54 16"
src="https://github.com/go-gitea/gitea/assets/115237/e7590c66-3b28-4790-9970-33bd567eeb31">
<img width="212" alt="Screenshot 2024-06-19 at 13 54 22"
src="https://github.com/go-gitea/gitea/assets/115237/8e1cfede-614c-4cea-9af2-ada6da7a7361">

Co-authored-by: silverwind <me@silverwind.io>
3 months agoReduce `air` verbosity (#31417) (#31425)
Giteabot [Wed, 19 Jun 2024 20:57:28 +0000 (04:57 +0800)]
Reduce `air` verbosity (#31417) (#31425)

Backport #31417 by @silverwind

Make `air` log less. Uses the option added in
https://github.com/air-verse/air/pull/367.

Co-authored-by: silverwind <me@silverwind.io>
3 months agoFix rendered wiki page link (#31398) (#31407)
wxiaoguang [Wed, 19 Jun 2024 03:23:24 +0000 (11:23 +0800)]
Fix rendered wiki page link (#31398) (#31407)

Backport #31398

Fix #31395

3 months agoFix double border in system status table (#31363) (#31401)
Giteabot [Mon, 17 Jun 2024 22:29:43 +0000 (06:29 +0800)]
Fix double border in system status table (#31363) (#31401)

Backport #31363 by silverwind

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
3 months agoFix bug filtering issues which have no project (#31337) (#31367)
Lunny Xiao [Mon, 17 Jun 2024 10:23:15 +0000 (18:23 +0800)]
Fix bug filtering issues which have no project (#31337) (#31367)

3 months agoFix natural sort (#31384) (#31394)
Giteabot [Mon, 17 Jun 2024 07:41:47 +0000 (15:41 +0800)]
Fix natural sort (#31384) (#31394)

Backport #31384 by wxiaoguang

Fix #31374

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
3 months agoFix missing images in editor preview due to wrong links (#31299) (#31393)
wxiaoguang [Mon, 17 Jun 2024 07:07:21 +0000 (15:07 +0800)]
Fix missing images in editor preview due to wrong links (#31299) (#31393)

Backport #31299

Parse base path and tree path so that media links can be correctly
created with /media/.

Resolves #31294

---------

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
4 months agoAllow downloading attachments of draft releases (#31369) (#31380)
Giteabot [Sun, 16 Jun 2024 12:55:14 +0000 (20:55 +0800)]
Allow downloading attachments of draft releases (#31369) (#31380)

Backport #31369 by Zettat123

Fix #31362

Co-authored-by: Zettat123 <zettat123@gmail.com>
4 months agoFix duplicate sub-path for avatars (#31365) (#31368)
wxiaoguang [Sat, 15 Jun 2024 03:44:44 +0000 (11:44 +0800)]
Fix duplicate sub-path for avatars (#31365) (#31368)

Backport #31365, only backport necessary changes.

4 months agoFix repo graph JS (#31377)
wxiaoguang [Fri, 14 Jun 2024 16:21:40 +0000 (00:21 +0800)]
Fix repo graph JS (#31377)

Fix #31376
Regression of #30395

4 months agoBackport Iif (#31353)
wxiaoguang [Thu, 13 Jun 2024 06:52:34 +0000 (14:52 +0800)]
Backport Iif (#31353)

4 months agoFixed incorrect localization `explorer.go` (#31348) (#31350)
Giteabot [Thu, 13 Jun 2024 02:16:17 +0000 (10:16 +0800)]
Fixed incorrect localization `explorer.go` (#31348) (#31350)

Backport #31348 by @kerwin612

see: https://github.com/go-gitea/gitea/pull/29701/files#r1637325139

Co-authored-by: Kerwin Bryant <kerwin612@qq.com>
4 months agoFix hash render end with colon (#31319) (#31346)
Giteabot [Thu, 13 Jun 2024 01:14:49 +0000 (09:14 +0800)]
Fix hash render end with colon (#31319) (#31346)

Backport #31319 by @lunny

Fix a hash render problem like `<hash>: xxxxx` which is usually used in
release notes.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoFix line number widths (#31341) (#31343)
Giteabot [Thu, 13 Jun 2024 00:13:35 +0000 (08:13 +0800)]
Fix line number widths (#31341) (#31343)

Backport #31341 by silverwind

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoFix adopt repository has empty object name in database (#31333) (#31335)
Giteabot [Wed, 12 Jun 2024 15:59:54 +0000 (23:59 +0800)]
Fix adopt repository has empty object name in database (#31333) (#31335)

Backport #31333 by @lunny

Fix #31330
Fix #31311

A workaround to fix the old database is to update object_format_name to
`sha1` if it's empty or null.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoFix navbar `+` menu flashing on page load (#31281) (#31342)
Giteabot [Wed, 12 Jun 2024 15:26:04 +0000 (23:26 +0800)]
Fix navbar `+` menu flashing on page load (#31281) (#31342)

Backport #31281 by silverwind

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoReduce memory usage for chunked artifact uploads to MinIO (#31325) (#31338)
Giteabot [Wed, 12 Jun 2024 14:25:46 +0000 (22:25 +0800)]
Reduce memory usage for chunked artifact uploads to MinIO (#31325) (#31338)

Backport #31325 by @bohde

When using the MinIO storage driver for Actions Artifacts, we found that
the chunked artifact required significantly more memory usage to both
upload and merge than the local storage driver. This seems to be related
to hardcoding a value of `-1` for the size to the MinIO client [which
has a warning about memory usage in the respective
docs](https://pkg.go.dev/github.com/minio/minio-go/v7#Client.PutObject).
Specifying the size in both the upload and merge case reduces memory
usage of the MinIO client.

Co-authored-by: Rowan Bohde <rowan.bohde@gmail.com>
Co-authored-by: Kyle D <kdumontnu@gmail.com>
4 months agoFix #31185 try fix lfs download from bitbucket failed (#31201) (#31329)
Giteabot [Tue, 11 Jun 2024 23:34:37 +0000 (07:34 +0800)]
Fix #31185 try fix lfs download from bitbucket failed (#31201) (#31329)

Backport #31201 by @Zoupers

Fix #31185

Co-authored-by: Zoupers Zou <1171443643@qq.com>
4 months agoDelete legacy cookie before setting new cookie (#31306) (#31317)
Giteabot [Tue, 11 Jun 2024 05:57:51 +0000 (13:57 +0800)]
Delete legacy cookie before setting new cookie (#31306) (#31317)

Backport #31306 by wxiaoguang

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoFix line number width in code preview (#31307) (#31316)
Giteabot [Tue, 11 Jun 2024 05:30:02 +0000 (13:30 +0800)]
Fix line number width in code preview (#31307) (#31316)

Backport #31307 by silverwind

Line numbers were using some hacky CSS `width: 1%` that did nothing to
the code rendering as far as I can tell but broken the inline preview in
markup when line numbers are greater than 2 digits. Also I removed one
duplicate `font-family` rule (it is set below in the `.lines-num,
.lines-code` selector.

Co-authored-by: silverwind <me@silverwind.io>
4 months agoAdd nix flake for dev shell (#30967) (#31310)
6543 [Tue, 11 Jun 2024 01:50:13 +0000 (03:50 +0200)]
Add nix flake for dev shell (#30967) (#31310)

Backport #30967

4 months agoRemove sub-path from container registry realm (#31293) (#31300)
Giteabot [Mon, 10 Jun 2024 04:04:49 +0000 (12:04 +0800)]
Remove sub-path from container registry realm (#31293) (#31300)

Backport #31293 by wxiaoguang

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoFix some URLs whose sub-path is missing (#31289) (#31292)
Giteabot [Fri, 7 Jun 2024 15:43:47 +0000 (23:43 +0800)]
Fix some URLs whose sub-path is missing (#31289) (#31292)

Backport #31289 by wxiaoguang

Fix #31285

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoFix and clean up `ConfirmModal` (#31283) (#31291)
Giteabot [Fri, 7 Jun 2024 13:51:54 +0000 (21:51 +0800)]
Fix and clean up `ConfirmModal` (#31283) (#31291)

Backport #31283 by @silverwind

Bug: orange button color was removed in
https://github.com/go-gitea/gitea/pull/30475, replaced with red
Bug: translation text was not html-escaped
Refactor: Replaced as much jQuery as possible, added useful
`createElementFromHTML`
Refactor: Remove colors checks that don't exist on `.link-action`

<img width="381" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/5900bf6a-8a86-4a86-b368-0559cbfea66e">

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
4 months agoOptimize repo-list layout to enhance visual experience (#31272) (#31276)
Giteabot [Fri, 7 Jun 2024 04:37:47 +0000 (12:37 +0800)]
Optimize repo-list layout to enhance visual experience (#31272) (#31276)

Backport #31272 by @kerwin612

before:

![1717655078227](https://github.com/go-gitea/gitea/assets/3371163/4d564f96-c2f8-46b1-996f-6cc7abb940ef)
***The problem was that the icon and text were not on a horizontal line,
and the horizontal was not centered;***

after:

![1717655094071](https://github.com/go-gitea/gitea/assets/3371163/b11797f6-05f8-486c-b5fd-df89d0cbdcfd)

Co-authored-by: Kerwin Bryant <kerwin612@qq.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agofixed the dropdown menu for the top New button to expand to the left (#31273) (#31275)
Giteabot [Fri, 7 Jun 2024 02:19:00 +0000 (10:19 +0800)]
fixed the dropdown menu for the top New button to expand to the left (#31273) (#31275)

Backport #31273 by @kerwin612

before:

![1717660314025](https://github.com/go-gitea/gitea/assets/3371163/17ae7a48-31c5-4c71-b285-f65d9106bf86)

after:

![1717660674763](https://github.com/go-gitea/gitea/assets/3371163/85f847ac-a044-4695-9004-26e6485288c6)

Co-authored-by: Kerwin Bryant <kerwin612@qq.com>
4 months agoFix Activity Page Contributors dropdown (#31264) (#31269)
Giteabot [Thu, 6 Jun 2024 08:14:00 +0000 (16:14 +0800)]
Fix Activity Page Contributors dropdown (#31264) (#31269)

Backport #31264 by wxiaoguang

Fix #31261

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoAdd replacement module for `mholt/archiver` (#31267) (#31270)
Giteabot [Thu, 6 Jun 2024 04:04:47 +0000 (12:04 +0800)]
Add replacement module for `mholt/archiver` (#31267) (#31270)

Backport #31267 by @silverwind

Switch to this fork tag:
https://github.com/anchore/archiver/releases/tag/v3.5.2 which includes
https://github.com/anchore/archiver/commit/82ca88a2eb24d418c30bf960ef071b0bbec04631.

Ref: https://pkg.go.dev/vuln/GO-2024-2698
Ref: https://github.com/advisories/GHSA-rhh4-rh7c-7r5v

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoOptimize runner-tags layout to enhance visual experience (#31258) (#31263)
Giteabot [Wed, 5 Jun 2024 20:35:36 +0000 (04:35 +0800)]
Optimize runner-tags layout to enhance visual experience (#31258) (#31263)

Backport #31258 by @kerwin612

![image](https://github.com/go-gitea/gitea/assets/3371163/b8199005-94f2-45be-8ca9-4fa1b3f221b2)

Co-authored-by: Kerwin Bryant <kerwin612@qq.com>
4 months agofix: allow actions artifacts storage migration to complete succesfully (#31251) ...
Giteabot [Wed, 5 Jun 2024 08:25:48 +0000 (16:25 +0800)]
fix: allow actions artifacts storage migration to complete succesfully (#31251) (#31257)

Backport #31251 by @bohde

Change the copy to use `ActionsArtifact.StoragePath` instead of the
`ArtifactPath`. Skip artifacts that are expired, and don't error if the
file to copy does not exist.

---

When trying to migrate actions artifact storage from local to MinIO, we
encountered errors that prevented the process from completing
successfully:

* The migration tries to copy the files using the per-run
`ArtifactPath`, instead of the unique `StoragePath`.
* Artifacts that have been marked expired and had their files deleted
would throw an error
* Artifacts that are pending, but don't have a file uploaded yet will
throw an error.

This PR addresses these cases, and allow the process to complete
successfully.

Co-authored-by: Rowan Bohde <rowan.bohde@gmail.com>
4 months agoMake blockquote attention recognize more syntaxes (#31240) (#31250)
Giteabot [Tue, 4 Jun 2024 16:03:01 +0000 (00:03 +0800)]
Make blockquote attention recognize more syntaxes (#31240) (#31250)

Backport #31240 by wxiaoguang

Fix #31214

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoFix admin oauth2 custom URL settings (#31246) (#31247)
Giteabot [Tue, 4 Jun 2024 15:11:07 +0000 (23:11 +0800)]
Fix admin oauth2 custom URL settings (#31246) (#31247)

Backport #31246 by wxiaoguang

Fix #31244

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoMake pasted "img" tag has the same behavior as markdown image (#31235) (#31243)
Giteabot [Tue, 4 Jun 2024 13:26:55 +0000 (21:26 +0800)]
Make pasted "img" tag has the same behavior as markdown image (#31235) (#31243)

Backport #31235 by wxiaoguang

Fix #31230

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoFix NuGet Package API for $filter with Id equality (#31188) (#31242)
Thomas Desveaux [Tue, 4 Jun 2024 11:56:59 +0000 (13:56 +0200)]
Fix NuGet Package API for $filter with Id equality (#31188) (#31242)

Backport #31188

Fixes issue when running `choco info pkgname` where `pkgname` is also a
substring of another package Id.

Relates to #31168

---

This might fix the issue linked, but I'd like to test it with more choco
commands before closing the issue in case I find other problems if
that's ok.
I'm pretty inexperienced with Go, so feel free to nitpick things.

Not sure I handled
[this](https://github.com/tdesveaux/gitea/blob/70f87e11b5caf1ee441ae71c7eba1831f45897d4/routers/api/packages/nuget/nuget.go#L135-L137)
in the best way, so looking for feedback on if I should fix the
underlying issue (`nil` might be a better default for `Value`?).

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
4 months agoFix overflow on push notification (#31179) (#31238)
Giteabot [Tue, 4 Jun 2024 10:15:25 +0000 (18:15 +0800)]
Fix overflow on push notification (#31179) (#31238)

Backport #31179 by @silverwind

Fixes: https://github.com/go-gitea/gitea/issues/30063
<img width="1301" alt="Screenshot 2024-05-30 at 14 43 24"
src="https://github.com/go-gitea/gitea/assets/115237/00443af0-088d-49a5-be9e-8c9adcc2c01d">

Co-authored-by: silverwind <me@silverwind.io>
4 months agoRemove .segment from .project-column (#31204) (#31239)
Giteabot [Tue, 4 Jun 2024 09:45:50 +0000 (17:45 +0800)]
Remove .segment from .project-column (#31204) (#31239)

Backport #31204 by @silverwind

Using `.segment` on the project columns is a major abuse of that class,
so remove it and instead set the border-radius directly on it.

Fixes: https://github.com/go-gitea/gitea/issues/31129
Co-authored-by: silverwind <me@silverwind.io>
4 months agoFix overflow on notifications (#31178) (#31237)
Giteabot [Tue, 4 Jun 2024 09:17:00 +0000 (17:17 +0800)]
Fix overflow on notifications (#31178) (#31237)

Backport #31178 by @silverwind

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

<img width="1312" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/627711ed-93ca-4be6-b958-10d673ae9517">

Co-authored-by: silverwind <me@silverwind.io>
4 months agoUpdate air package path (#31233) (#31236)
Giteabot [Tue, 4 Jun 2024 05:28:21 +0000 (13:28 +0800)]
Update air package path (#31233) (#31236)

4 months agoFix overflow in issue card (#31203) (#31225)
Giteabot [Mon, 3 Jun 2024 02:14:15 +0000 (10:14 +0800)]
Fix overflow in issue card (#31203) (#31225)

Backport #31203 by @silverwind

Before:

<img width="373" alt="Screenshot 2024-06-01 at 01 31 26"
src="https://github.com/go-gitea/gitea/assets/115237/82a210f2-c82e-4b7e-ac43-e70e46fa1186">

After:
<img width="376" alt="Screenshot 2024-06-01 at 01 31 32"
src="https://github.com/go-gitea/gitea/assets/115237/82d1b9f7-4fad-47bd-948a-04e1e7e006e6">

Co-authored-by: silverwind <me@silverwind.io>
4 months agoFix agit checkout command line hint & fix ShowMergeInstructions checking (#31219...
Giteabot [Mon, 3 Jun 2024 01:45:57 +0000 (09:45 +0800)]
Fix agit checkout command line hint & fix ShowMergeInstructions checking (#31219) (#31222)

Backport #31219 by @lunny

Fix #31135

Before
<img width="527" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/60c07b55-3db2-4a9a-98f1-0eb72d149df2">

After
<img width="664" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/0670ff5d-9e0b-47ac-aba4-9db9131de3b3">

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoFix the possible migration failure on 286 with postgres 16 (#31209) (#31218)
Giteabot [Sun, 2 Jun 2024 07:19:30 +0000 (15:19 +0800)]
Fix the possible migration failure on 286 with postgres 16 (#31209) (#31218)

Backport #31209 by @lunny

Try to fix #31205

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoSplit sanitizer functions and fine-tune some tests (#31192) (#31200)
Giteabot [Fri, 31 May 2024 13:54:14 +0000 (21:54 +0800)]
Split sanitizer functions and fine-tune some tests (#31192) (#31200)

Backport #31192 by wxiaoguang

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoFix URL In Gitea Actions Badge Docs (#31191) (#31198)
Giteabot [Fri, 31 May 2024 13:08:04 +0000 (21:08 +0800)]
Fix URL In Gitea Actions Badge Docs (#31191) (#31198)

Backport #31191 by @TheBrokenRail

The example URL given in the documentation leads to a 404.

For instance,
`https://your-gitea-instance.com/{owner}/{repo}/actions/workflows/{workflow_file}?branch={branch}&event={event}`
translates to
`https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/actions/workflows/build.yml`,
which is a 404.

I had to check the [linked GitHub
docs](https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/adding-a-workflow-status-badge)
to learn that you have to add `/badge.svg` to the URL.

Example:
https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/actions/workflows/build.yml/badge.svg

Co-authored-by: TheBrokenRail <17478432+TheBrokenRail@users.noreply.github.com>
4 months agoFix branch order (#31174) (#31193)
Giteabot [Fri, 31 May 2024 03:34:05 +0000 (11:34 +0800)]
Fix branch order (#31174) (#31193)

Backport #31174 by @lunny

Fix #31172

The original order or the default order should not be ignored even if we
have an is_deleted order.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoFix push multiple branches error with tests (#31151) (#31153)
Giteabot [Thu, 30 May 2024 07:04:42 +0000 (15:04 +0800)]
Fix push multiple branches error with tests (#31151) (#31153)

Backport #31151 by @lunny

Fix #31140

The previous logic is wrong when pushing multiple branches. After first
branch updated, it will ignore left other branches sync operations.

As a workaround for the repositories, just push a new commit after the
patch applied will fix the repositories status.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoIgnore FindRecentlyPushedNewBranches err (#31164) (#31171)
wxiaoguang [Thu, 30 May 2024 06:24:14 +0000 (14:24 +0800)]
Ignore FindRecentlyPushedNewBranches err (#31164) (#31171)

Backport #31164

4 months agoSwap word order in Comment and Close (#31148) (#31165)
Giteabot [Thu, 30 May 2024 01:07:27 +0000 (09:07 +0800)]
Swap word order in Comment and Close (#31148) (#31165)

Backport #31148 by @techknowlogick

Reduce accident closing of tickets only to re-open them right away. This
aligns the text on these buttons with what GitHub has.

Commit is authored by @LazyDodo, and was committed to the Blender fork
by @brechtvl

Background details:
https://projects.blender.org/infrastructure/gitea-custom/pulls/7

Co-authored-by: techknowlogick <techknowlogick@gitea.com>
Co-authored-by: Ray Molenkamp <github@lazydodo.com>
4 months agoFix markup preview (#31158) (#31166)
Giteabot [Thu, 30 May 2024 00:38:30 +0000 (08:38 +0800)]
Fix markup preview (#31158) (#31166)

Backport #31158 by @wxiaoguang

Fix #31157

After:

![image](https://github.com/go-gitea/gitea/assets/2114189/4d918cce-cd0d-4601-9c81-4b32df1b0b38)

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoUse vertical layout for multiple code expander buttons (#31122) (#31152)
Giteabot [Wed, 29 May 2024 07:06:34 +0000 (15:06 +0800)]
Use vertical layout for multiple code expander buttons (#31122) (#31152)

Backport #31122 by @silverwind

Fixes: https://github.com/go-gitea/gitea/issues/31068
- Now it only does a single call to `GetExpandDirection` per line
instead of multiples.
- Exposed `data-expand-direction` to frontend so it can correctly size
the buttons (it's a pain to do in tables).

<img width="142" alt="Screenshot 2024-05-27 at 20 44 56"
src="https://github.com/go-gitea/gitea/assets/115237/8b0b45a6-8e50-4081-8822-5e0775d8d941">
<img width="142" alt="Screenshot 2024-05-27 at 20 44 51"
src="https://github.com/go-gitea/gitea/assets/115237/b7ba2c57-8f55-4e9f-9606-c96d16b77892">
<img width="132" alt="Screenshot 2024-05-27 at 20 44 46"
src="https://github.com/go-gitea/gitea/assets/115237/0e838fb8-5e8c-4250-9843-a68b88d5418b">
<img width="80" alt="Screenshot 2024-05-27 at 20 44 33"
src="https://github.com/go-gitea/gitea/assets/115237/da6c7f83-c160-4389-8ab2-889d0568cbe8">
<img width="80" alt="Screenshot 2024-05-27 at 20 44 26"
src="https://github.com/go-gitea/gitea/assets/115237/cdb490b2-5040-484a-92e5-46fc5e37c199">
<img width="78" alt="Screenshot 2024-05-27 at 20 44 20"
src="https://github.com/go-gitea/gitea/assets/115237/d2978ab0-764e-41ff-922c-25f8fe749f28">

Would backport as trivial enhancement.

Co-authored-by: silverwind <me@silverwind.io>
4 months agoAdd an immutable tarball link to archive download headers for Nix (#31139) (#31145)
Giteabot [Wed, 29 May 2024 01:34:14 +0000 (09:34 +0800)]
Add an immutable tarball link to archive download headers for Nix (#31139) (#31145)

Backport #31139 by @Mic92

This allows `nix flake metadata` and nix in general to lock a *branch*
tarball link in a manner that causes it to fetch the correct commit even
if the branch is updated with a newer version.

For further context, Nix flakes are a feature that, among other things,
allows for "inputs" that are "github:someuser/somerepo",
"https://some-tarball-service/some-tarball.tar.gz",
"sourcehut:~meow/nya" or similar. This feature allows our users to fetch
tarballs of git-based inputs to their builds rather than using git to
fetch them, saving significant download time.

There is presently no gitea or forgejo specific fetcher in Nix, and we
don't particularly wish to have one. Ideally (as a developer on a Nix
implementation myself) we could just use the generic tarball fetcher and
not add specific forgejo support, but to do so, we need additional
metadata to know which commit a given *branch* tarball represents, which
is the purpose of the Link header added here.

The result of this patch is that a Nix user can specify
`inputs.something.url =
"https://forgejo-host/some/project/archive/main.tar.gz"` in flake.nix
and get a link to some concrete tarball for the actual commit in the
lock file, then when they run `nix flake update` in the future, they
will get the latest commit in that branch.

Example of it working locally:

» nix flake metadata --refresh
'http://localhost:3000/api/v1/repos/jade/cats/archive/main.tar.gz?dir=configs/nix'
Resolved URL:
http://localhost:3000/api/v1/repos/jade/cats/archive/main.tar.gz?dir=configs/nix
Locked URL:
http://localhost:3000/api/v1/repos/jade/cats/archive/804ede182b6b66469b23ea4d21eece52766b7a06.tar.gz?dir=configs
/nix&narHash=sha256-yP7KkDVfuixZzs0fsqhSETXFC0y8m6nmPLw2GrAMxKQ%3D
Description:   Computers with the nixos
Path:          /nix/store/s856c6yqghyan4v0zy6jj19ksv0q22nx-source
Revision:      804ede182b6b66469b23ea4d21eece52766b7a06
Last modified: 2024-05-02 00:48:32

For details on the header value, see:

https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md

Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
Co-authored-by: Jade Lovelace <software@lfcode.ca>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoUpdate demo site location from try.gitea.io -> demo.gitea.com (#31054) (#31146)
Giteabot [Wed, 29 May 2024 01:05:07 +0000 (09:05 +0800)]
Update demo site location from try.gitea.io -> demo.gitea.com (#31054) (#31146)

Backport #31054 by @lunny

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoRemove duplicate `ProxyPreserveHost` in Apache httpd doc (#31143) (#31147)
Giteabot [Wed, 29 May 2024 00:54:14 +0000 (08:54 +0800)]
Remove duplicate `ProxyPreserveHost` in Apache httpd doc (#31143) (#31147)

Backport #31143 by @HorlogeSkynet

---

(fix up for #31003)

Co-authored-by: Samuel FORESTIER <HorlogeSkynet@users.noreply.github.com>
4 months agoImprove mobile review ui (#31091) (#31136)
Giteabot [Tue, 28 May 2024 14:10:01 +0000 (22:10 +0800)]
Improve mobile review ui (#31091) (#31136)

Backport #31091 by @silverwind

Fixes: https://github.com/go-gitea/gitea/issues/31071
Not perfect but much better than before.

Before: Overflows, sticky not working, filename unreadable:

<img width="506" alt="Screenshot 2024-05-27 at 02 02 40"
src="https://github.com/go-gitea/gitea/assets/115237/a06b1edf-dece-4402-98c2-68670fca265f">

After:
<img width="457" alt="Screenshot 2024-05-27 at 01 59 06"
src="https://github.com/go-gitea/gitea/assets/115237/2a282c96-e719-4554-b418-81963ae6269c">

Co-authored-by: silverwind <me@silverwind.io>
4 months agoAdd missed return after `ctx.ServerError` (#31130) (#31133)
Giteabot [Tue, 28 May 2024 10:47:11 +0000 (18:47 +0800)]
Add missed return after `ctx.ServerError` (#31130) (#31133)

Backport #31130 by @lunny

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoFix API repository object format missed (#31118) (#31132)
Giteabot [Tue, 28 May 2024 09:59:56 +0000 (17:59 +0800)]
Fix API repository object format missed (#31118) (#31132)

Backport #31118 by @lunny

Fix #31117

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoFix DashboardRepoList margin (#31121) (#31128)
Giteabot [Tue, 28 May 2024 09:12:15 +0000 (17:12 +0800)]
Fix DashboardRepoList margin (#31121) (#31128)

Backport #31121 by @silverwind

Fixes: https://github.com/go-gitea/gitea/issues/31115
<img width="476" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/ba508ba9-b02d-47c6-ad9f-495101c81330">

Co-authored-by: silverwind <me@silverwind.io>
4 months agoMove documents under actions (#31110) (#31116)
Giteabot [Mon, 27 May 2024 15:05:49 +0000 (23:05 +0800)]
Move documents under actions (#31110) (#31116)

Backport #31110 by @lunny

Move secrets and badge under actions

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoFix missing memcache import (#31105) (#31109)
Giteabot [Mon, 27 May 2024 14:23:47 +0000 (22:23 +0800)]
Fix missing memcache import (#31105) (#31109)

Backport #31105 by wxiaoguang

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoUpdate pip related commands for docker (#31106) (#31111)
Giteabot [Mon, 27 May 2024 13:54:19 +0000 (21:54 +0800)]
Update pip related commands for docker (#31106) (#31111)

Backport #31106 by wxiaoguang

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoAdd v1.22.0 changelog (#31060) v1.22.0
Lunny Xiao [Mon, 27 May 2024 07:51:53 +0000 (15:51 +0800)]
Add v1.22.0 changelog (#31060)

4 months agoPrevent tab shifting, remove extra margin on fluid pages (#31090) (#31099)
Giteabot [Mon, 27 May 2024 07:41:10 +0000 (15:41 +0800)]
Prevent tab shifting, remove extra margin on fluid pages (#31090) (#31099)

Backport #31090 by @silverwind

1. Extend concept of https://github.com/go-gitea/gitea/pull/29831 to all
tabular menus, there were only three left that weren't already
`<overflow-menu>`.

<img width="634" alt="Screenshot 2024-05-27 at 00 42 16"
src="https://github.com/go-gitea/gitea/assets/115237/d9a7e219-d05e-40a1-9e93-777f9a8a90dd">
<img width="965" alt="Screenshot 2024-05-27 at 00 29 32"
src="https://github.com/go-gitea/gitea/assets/115237/e6ed71b1-11fb-4a74-9adb-af4524286cff">

2. Remove extra padding on `fluid padded` container like for example PR
diff view. The page margin is already correctly sized via
`.ui.container`, so this was just extraneous padding that looked ugly.

Before:
<img width="1351" alt="Screenshot 2024-05-27 at 00 45 11"
src="https://github.com/go-gitea/gitea/assets/115237/4b45fd11-b1b2-4fbb-a618-26eb22be9472">

After:
<img width="1344" alt="Screenshot 2024-05-27 at 00 45 22"
src="https://github.com/go-gitea/gitea/assets/115237/d09593eb-6c7f-45e7-85b6-f0050047004b">

3. Replace `gt-word-break` with `tw-break-anywhere` in issue-title,
fixing overflow.

Before:
<img width="1333" alt="Screenshot 2024-05-27 at 00 50 14"
src="https://github.com/go-gitea/gitea/assets/115237/64d15d04-b456-401e-a972-df636965f0eb">

After:
<img width="1316" alt="Screenshot 2024-05-27 at 00 50 26"
src="https://github.com/go-gitea/gitea/assets/115237/ed1ce830-1408-414b-8263-eeaf773f52c8">

Co-authored-by: silverwind <me@silverwind.io>
4 months agoFix border radius on hovered secondary menu (#31089) (#31097)
Giteabot [Mon, 27 May 2024 07:07:16 +0000 (15:07 +0800)]
Fix border radius on hovered secondary menu (#31089) (#31097)

Backport #31089 by @silverwind

Presumably a regression from
https://github.com/go-gitea/gitea/pull/30325, these menus were showing a
border radius on hover, which is fixed with this change.

<img width="154" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/eafdc1c5-3cf5-48d1-86c4-21c58f92cfaf">

Co-authored-by: silverwind <me@silverwind.io>
4 months agoFix possible ui 500 if workflow's job is nil (#31092) (#31098)
Giteabot [Mon, 27 May 2024 06:13:15 +0000 (14:13 +0800)]
Fix possible ui 500 if workflow's job is nil (#31092) (#31098)

Backport #31092 by @lunny

Fix #31087

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoFix `View File` button link if branch deleted on pull request files pages (#31063...
Giteabot [Sun, 26 May 2024 14:07:17 +0000 (22:07 +0800)]
Fix `View File` button link if branch deleted on pull request files pages (#31063) (#31077)

4 months agoChange `--border-radius-circle` to `--border-radius-full` (#30936) (#31078)
Giteabot [Sun, 26 May 2024 13:16:13 +0000 (21:16 +0800)]
Change `--border-radius-circle` to `--border-radius-full` (#30936) (#31078)

4 months agoMake gitea webhooks openproject compatible (#28435) (#31081)
Giteabot [Sun, 26 May 2024 04:53:42 +0000 (12:53 +0800)]
Make gitea webhooks openproject compatible (#28435) (#31081)

Backport #28435 by Chief-Detektor

Co-authored-by: André Rosenhammer <andre.rosenhammer@gmail.com>
4 months agoSupport setting the `default` attribute of the issue template dropdown field (#31045...
Giteabot [Fri, 24 May 2024 03:01:09 +0000 (11:01 +0800)]
Support setting the `default` attribute of the issue template dropdown field (#31045) (#31059)

Backport #31045 by @Zettat123

Fix #31044

According to [GitHub issue template
documentation](https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema#attributes-for-dropdown),
the `default` attribute can be used to specify the preselected option
for a dropdown field.

Co-authored-by: Zettat123 <zettat123@gmail.com>
4 months agoAlpine 3.20 has been released (#31047) (#31057)
Giteabot [Thu, 23 May 2024 12:36:34 +0000 (20:36 +0800)]
Alpine 3.20 has been released (#31047) (#31057)

Backport #31047 by @techknowlogick

Co-authored-by: techknowlogick <techknowlogick@gitea.com>
4 months agoFix wrong display of recently pushed notification (#25812) (#31043)
yp05327 [Thu, 23 May 2024 04:14:26 +0000 (13:14 +0900)]
Fix wrong display of recently pushed notification (#25812) (#31043)

Backport #25812

~~ps: removed some new codes in `tests/integration/pull_merge_test.go`~~

---------

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agoalign s3 files with docker naming (#31050) (#31052)
Giteabot [Thu, 23 May 2024 00:06:52 +0000 (08:06 +0800)]
align s3 files with docker naming (#31050) (#31052)

4 months agoUpdate Actions documentation missing feature (#31034) (#31048)
Giteabot [Wed, 22 May 2024 15:04:40 +0000 (23:04 +0800)]
Update Actions documentation missing feature (#31034) (#31048)

Backport #31034 by @lunny

Fix
https://github.com/go-gitea/gitea/issues/25897#issuecomment-2117145391

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: yp05327 <576951401@qq.com>
4 months agoSync up deleted branches & action assets related cleanup documentation (#31022) ...
Giteabot [Wed, 22 May 2024 15:02:34 +0000 (23:02 +0800)]
Sync up deleted branches & action assets related cleanup documentation (#31022) (#31049)

Backport #31022 by @kemzeb

Syncs up docs associated to actions and deleted branch cleanup i.e. in
custom/app.example.ini and the config cheat sheet.

Co-authored-by: Kemal Zebari <60799661+kemzeb@users.noreply.github.com>
4 months agoFix automerge will not work because of some events haven't been triggered (#30780...
Giteabot [Wed, 22 May 2024 02:08:05 +0000 (10:08 +0800)]
Fix automerge will not work because of some events haven't been triggered (#30780) (#31039)

Backport #30780 by @lunny

Replace #25741
Close #24445
Close #30658
Close #20646
~Depends on #30805~

Since #25741 has been rewritten totally, to make the contribution
easier, I will continue the work in this PR. Thanks @6543

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
4 months agouse existing oauth grant for public client (#31015) (#31042)
Giteabot [Tue, 21 May 2024 17:32:31 +0000 (01:32 +0800)]
use existing oauth grant for public client (#31015) (#31042)

Backport #31015 by @denyskon

Do not try to create a new authorization grant when one exists already,
thus preventing a DB-related authorization issue.

Fix https://github.com/go-gitea/gitea/pull/30790#issuecomment-2118812426

Co-authored-by: Denys Konovalov <kontakt@denyskon.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
4 months agoDon't include link of deleted branch when listing branches (#31028) (#31032)
Giteabot [Tue, 21 May 2024 07:51:36 +0000 (15:51 +0800)]
Don't include link of deleted branch when listing branches (#31028) (#31032)

Backport #31028 by @kemzeb

From
https://github.com/go-gitea/gitea/issues/31018#issuecomment-2119622680.

This commit removes the link to a deleted branch name because it returns
a 404 while it is in this deleted state. GitHub also throws a 404 when
navigating to a branch link that was just deleted, but this deleted
branch is removed from the branch list after a page refresh. Since with
Gitea this deleted branch would be kept around for quite some time
(well, until the "cleanup deleted branches" cron job begins), it makes
sense to not have this as a link that users can navigate to.

Co-authored-by: Kemal Zebari <60799661+kemzeb@users.noreply.github.com>