Loïc Dachary
92450913a8
fix POST /{username}/{reponame}/{type:issues|pulls}/move_pin
...
(cherry picked from commit d97efb777f
)
2023-11-26 06:50:26 +01:00
Loïc Dachary
9ea9ba8e7e
fix POST /{username}/{reponame}/{type:issues|pulls}/{index}/content-history/soft-delete
...
(cherry picked from commit a82cb96480
)
2023-11-26 06:48:49 +01:00
Lunny Xiao
db0d71ec0f
Fix comment permissions ( #28213 ) ( #28217 )
...
backport #28213
This PR will fix some missed checks for private repositories' data on
web routes and API routes.
(cherry picked from commit dfd511faf3
)
2023-11-26 06:35:50 +01:00
Loïc Dachary
c21cc34116
Revert "fix POST /{owner}/{repo}/comments/{id}/delete"
...
This reverts commit 44f2592028
.
2023-11-26 06:34:38 +01:00
Loïc Dachary
db1bd78d71
Revert "fix POST /{owner}/{repo}/comments/{id}"
...
This reverts commit 5cc6361e31
.
2023-11-26 06:34:38 +01:00
Loïc Dachary
5fc5d186e0
Revert "fix POST /{owner}/{repo}/comments/{id}/reactions/{action}"
...
This reverts commit 6f87e71f0c
.
2023-11-26 06:34:38 +01:00
Loïc Dachary
710eee48a1
Revert "fix GET /{owner}/{repo}/comments/{id}/attachments"
...
This reverts commit 48bcb1937e
.
2023-11-26 06:34:38 +01:00
Loïc Dachary
e587faae57
Revert "fix POST /{username}/{reponame}/{type:issues|pulls}/{index}/content-history/soft-delete"
...
This reverts commit 75730a6ded
.
2023-11-26 06:34:37 +01:00
Loïc Dachary
d7f5ff0782
Revert "fix GET /{username}/{reponame}/{type:issues|pulls}/{index}/content-history/detail"
...
This reverts commit 5ef4992fd7
.
2023-11-26 06:34:37 +01:00
Loïc Dachary
53115c7c17
Revert "fix POST /{username}/{reponame}/{tags,release}/delete"
...
This reverts commit a2b1082dda
.
2023-11-26 06:34:37 +01:00
Loïc Dachary
4927e73551
Revert "fix POST /{username}/{reponame}/{type:issues|pulls}/move_pin"
...
This reverts commit e9aa373db5
.
2023-11-26 06:34:37 +01:00
Loïc Dachary
e9aa373db5
fix POST /{username}/{reponame}/{type:issues|pulls}/move_pin
...
(cherry picked from commit 7eda733ed6a22c08a85fdc90deec0c440427cef7)
2023-11-25 08:08:37 +01:00
Loïc Dachary
a2b1082dda
fix POST /{username}/{reponame}/{tags,release}/delete
...
(cherry picked from commit a6d2ad6310f754952998fd73118da9f91c563145)
2023-11-25 08:08:37 +01:00
Loïc Dachary
5ef4992fd7
fix GET /{username}/{reponame}/{type:issues|pulls}/{index}/content-history/detail
...
(cherry picked from commit 0853dec293dd632a03948f66af69e75dd582a92d)
2023-11-25 08:08:36 +01:00
Loïc Dachary
75730a6ded
fix POST /{username}/{reponame}/{type:issues|pulls}/{index}/content-history/soft-delete
...
(cherry picked from commit a11d82a42729eba02032310f7778a9197f4f8ead)
2023-11-25 08:08:36 +01:00
Loïc Dachary
48bcb1937e
fix GET /{owner}/{repo}/comments/{id}/attachments
...
(cherry picked from commit aed193ef9f5d59aed12cfd7518765d5598c7999f)
2023-11-25 07:23:34 +01:00
Loïc Dachary
6f87e71f0c
fix POST /{owner}/{repo}/comments/{id}/reactions/{action}
...
(cherry picked from commit 21d4556cbeb9d0f825398114ba3a4816f331315b)
2023-11-25 07:23:34 +01:00
Loïc Dachary
5cc6361e31
fix POST /{owner}/{repo}/comments/{id}
...
(cherry picked from commit 385a1f337462bec34ccc389d4efe21e3b2be8465)
2023-11-25 07:23:34 +01:00
Loïc Dachary
44f2592028
fix POST /{owner}/{repo}/comments/{id}/delete
...
(cherry picked from commit 1b57d8493882d9d659164acd3b4a5a99c769d8ed)
2023-11-25 07:23:34 +01:00
Lunny Xiao
f2c3491b61
Fix http protocol auth ( #27875 ) ( #27878 )
...
backport #27875
(cherry picked from commit 1dedf9bba0
)
2023-11-14 13:17:12 +01:00
Giteabot
c50af699ea
When comparing with an non-exist repository, return 404 but 500 ( #27437 ) ( #27441 )
...
Backport #27437 by @lunny
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 973b7f6298
)
2023-11-14 13:17:11 +01:00
Giteabot
64a418dfc7
Fix issue templates when blank isses are disabled ( #27061 ) ( #27082 )
...
Backport #27061 by @JakobDev
Fixes #27060
Co-authored-by: JakobDev <jakobdev@gmx.de>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: delvh <dev.lh@web.de>
(cherry picked from commit b139234fa8
)
2023-09-20 12:50:46 +02:00
Giteabot
1689b3da55
Redirect from `{repo}/issues/new` to `{repo}/issues/new/choose` when blank issues are disabled ( #26813 ) ( #26847 )
...
Backport #26813 by @JakobDev
You can currently visit `{repo}/issues/new` and create a blank issue,
even if it's disabled. This PR fixes this,
Fixes https://codeberg.org/forgejo/forgejo/issues/1356
Co-authored-by: JakobDev <jakobdev@gmx.de>
(cherry picked from commit 2cfabb68ff
)
2023-09-08 08:09:18 +02:00
Giteabot
1d228e6ee9
Fix being unable to use a repo that prohibits accepting PRs as a PR source. ( #26785 ) ( #26790 )
...
Backport #26785 by @CaiCandong
## Description
Sometimes, we need to use an upstream mirror repository to update the
current development repository, but mirror repositories are prohibited
from PR. It should not appear in `merge to,` but it can appear in `pull
from.`
Fix #24585 #26193 #26781
Related #24183
Many thanks to @apnote for assisting me in reproducing this bug!
## ScreenShot
---
### Before
<img
src="https://github.com/go-gitea/gitea/assets/50507092/3d76c376-1f54-45b9-80c9-6ba8319d6a9a "
width="400px">
<img
src="https://github.com/go-gitea/gitea/assets/50507092/fbfd9f7f-421f-4a2e-9a3e-f2958bbf3312 "
width="400px">
### After
<img
src="https://github.com/go-gitea/gitea/assets/50507092/e6984524-4f61-4310-b795-4d8598bd8963 "
width="400px">
<img
src="https://github.com/go-gitea/gitea/assets/50507092/04065b44-78d7-4721-bf31-0f1674150727 "
width="400px">
Co-authored-by: CaiCandong <50507092+CaiCandong@users.noreply.github.com>
(cherry picked from commit 3bab20491e
)
2023-09-08 08:09:18 +02:00
Giteabot
ef46b01168
Fix unable to display individual-level project ( #26198 ) ( #26636 )
...
Backport #26198 by @CaiCandong
As title
Before:
![image](https://github.com/go-gitea/gitea/assets/50507092/94afc3bf-5597-4151-a59b-5632840ffa21 )
After:
![image](https://github.com/go-gitea/gitea/assets/50507092/df81aa0b-98a6-477d-a270-2e45b3dca0fc )
fix #26189
Co-authored-by: caicandong <50507092+CaiCandong@users.noreply.github.com>
(cherry picked from commit 352a495c02
)
2023-09-08 08:07:19 +02:00
a1012112796
5abca17b64
fix reopen logic for agit flow pull request ( #26399 ) ( #26613 )
...
Backport #26399
Signed-off-by: a1012112796 <1012112796@qq.com>
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit f43df2f820
)
2023-09-08 08:07:19 +02:00
Giteabot
4ac522c8aa
Sync repo's IsEmpty status correctly ( #26517 ) ( #26560 )
...
Backport #26517 by @wxiaoguang
Close #26509
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 7da85fa0c3
)
2023-08-21 07:27:20 +02:00
Giteabot
d297a87f75
Add ThreadID parameter for Telegram webhooks ( #25996 ) ( #26480 )
...
Backport #25996
Telegram has recently implemented threads (channels) for group chats.
Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com>
Co-authored-by: neveraskedtoexist <matikot415@gmail.com>
(cherry picked from commit acc0fd22d8
)
2023-08-21 07:22:19 +02:00
Giteabot
8265bece8e
Introduce ctx.PathParamRaw to avoid incorrect unescaping ( #26392 ) ( #26405 )
...
Backport #26392 by @wxiaoguang
Fix #26389
And complete an old TODO: `ctx.Params does un-escaping,..., which is
incorrect.`
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 2d1a7e1cd4
)
2023-08-21 07:22:18 +02:00
Earl Warren
20557c6bdb
[BRANDING] define the forgejo webhook type
...
templates/swagger/v1_json.tmpl updated with `make generate-swagger`
(cherry picked from commit 88899c492e
)
(cherry picked from commit 7171bd9617
)
(cherry picked from commit 1a742446c1
)
(cherry picked from commit d7c189d7b2
)
Conflicts:
routers/web/web.go
(cherry picked from commit cbdea868e4
)
(cherry picked from commit 6cd150483b
)
(cherry picked from commit 47246da8d3
)
(cherry picked from commit f2aa0e6b76
)
(cherry picked from commit 5a4fc69a16
)
(cherry picked from commit 48e444ca09
)
(cherry picked from commit 888e537811
)
(cherry picked from commit 5121f493c9
)
(cherry picked from commit 9394e55fdf
)
(cherry picked from commit 3a2ce51768
)
(cherry picked from commit 719ead3a65
)
(cherry picked from commit 83e6f82e2a
)
(cherry picked from commit 494a429b21
)
(cherry picked from commit 4d775db6b4
)
(cherry picked from commit b68f777dc2
)
(cherry picked from commit 5b934023fa
)
(cherry picked from commit 3b1ed8b16c
)
(cherry picked from commit 6bc4a46c9f
)
(cherry picked from commit 8064bb24a3
)
Conflicts:
templates/admin/hook_new.tmpl
templates/org/settings/hook_new.tmpl
templates/repo/settings/webhook/base_list.tmpl
templates/repo/settings/webhook/new.tmpl
templates/user/settings/hook_new.tmpl
https://codeberg.org/forgejo/forgejo/pulls/1181
(cherry picked from commit 55f5588a91
)
Conflicts:
routers/web/web.go
https://codeberg.org/forgejo/forgejo/issues/1219
2023-08-21 07:22:16 +02:00
Earl Warren
c862cc15c8
Revert "[BRANDING] define the forgejo webhook type"
...
This reverts commit 02ba08ca84
.
2023-08-21 07:22:16 +02:00
Giteabot
c2f2fed57a
Fix pull request check list is limited ( #26179 ) ( #26245 )
...
Backport #26179 by @CaiCandong
In the original implementation, we can only get the first 30 records of
the commit status (the default paging size), if the commit status is
more than 30, it will lead to the bug #25990 . I made the following two
changes.
- On the page, use the ` db.ListOptions{ListAll: true}` parameter
instead of `db.ListOptions{}`
- The `GetLatestCommitStatus` function makes a determination as to
whether or not a pager is being used.
fixed #25990
Co-authored-by: caicandong <50507092+CaiCandong@users.noreply.github.com>
(cherry picked from commit 060026995a
)
2023-08-21 07:22:15 +02:00
Giteabot
884f2c125c
Fix the route for pull-request's authors ( #26016 ) ( #26018 )
...
Backport #26016 by @wxiaoguang
Close #25906
![image](https://github.com/go-gitea/gitea/assets/2114189/e689f3e1-9a90-46c0-89f4-2d61394d34d3 )
Succeeded logs:
```
[I] router: completed GET /root/test/issues/posters?&q=%20&_=1689853025011 for [::1]:59271, 200 OK in 127.7ms @ repo/issue.go:3505(repo.IssuePosters)
[I] router: completed GET /root/test/pulls/posters?&q=%20&_=1689853968204 for [::1]:59269, 200 OK in 94.3ms @ repo/issue.go:3509(repo.PullPosters)
```
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 54a516e9da
)
2023-07-24 07:59:10 +02:00
Giteabot
16102d3787
Ignore `runs-on` with expressions when warning no matched runners ( #25917 ) ( #25933 )
...
Backport #25917 by @wolfogre
Fix #25905
Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit b7d054e4b5
)
2023-07-24 07:58:56 +02:00
Giteabot
27a40aeb6b
Avoid opening/closing PRs which are already merged ( #25883 ) ( #25903 )
...
Backport #25883 by @yp05327
We can select PRs to open/close them by one click, but we forgot to
check whether it is merged.
You can get an opening merged PR:
![image](https://github.com/go-gitea/gitea/assets/18380374/22c2e747-4bb9-4742-a9aa-ef39d5308bc5 )
You can confirm this in:
https://try.gitea.io/yp05327/testrepo/pulls/5
Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit 9159964ada
)
2023-07-24 07:58:56 +02:00
Giteabot
61c6814c15
Fix incorrect milestone count when provide a keyword ( #25880 ) ( #25904 )
...
Backport #25880 by @yp05327
You can confirm this issue in:
https://try.gitea.io/yp05327/testrepo/milestones?state=open&q=a
There's no milestone, but the count is 1.
![image](https://github.com/go-gitea/gitea/assets/18380374/25e58cee-aeeb-43c1-8ec8-6e2ec6bf1284 )
Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit 36b9a86bd8
)
2023-07-24 07:58:50 +02:00
Earl Warren
1371196064
Merge remote-tracking branch 'forgejo/v1.20/forgejo-moderation' into v1.20/forgejo
2023-07-17 08:01:23 +02:00
Gusted
dc9499bdf9
[MODERATION] user blocking
...
- Add the ability to block a user via their profile page.
- This will unstar their repositories and visa versa.
- Blocked users cannot create issues or pull requests on your the doer's repositories (mind that this is not the case for organizations).
- Blocked users cannot comment on the doer's opened issues or pull requests.
- Blocked users cannot add reactions to doer's comments.
- Blocked users cannot cause a notification trough mentioning the doer.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/540
(cherry picked from commit 687d852480
)
(cherry picked from commit 0c32a4fde5
)
(cherry picked from commit 1791130e3c
)
(cherry picked from commit 00f411819f
)
(cherry picked from commit e0c039b0e8
)
(cherry picked from commit b5a058ef00
)
(cherry picked from commit 5ff5460d28
)
(cherry picked from commit 97bc6e619d
)
2023-07-17 00:26:42 +02:00
Earl Warren
02ba08ca84
[BRANDING] define the forgejo webhook type
...
templates/swagger/v1_json.tmpl updated with `make generate-swagger`
(cherry picked from commit 88899c492e
)
(cherry picked from commit 7171bd9617
)
(cherry picked from commit 1a742446c1
)
(cherry picked from commit d7c189d7b2
)
Conflicts:
routers/web/web.go
(cherry picked from commit cbdea868e4
)
(cherry picked from commit 6cd150483b
)
(cherry picked from commit 47246da8d3
)
(cherry picked from commit f2aa0e6b76
)
(cherry picked from commit 5a4fc69a16
)
(cherry picked from commit 48e444ca09
)
(cherry picked from commit 888e537811
)
(cherry picked from commit 5121f493c9
)
(cherry picked from commit 9394e55fdf
)
(cherry picked from commit 3a2ce51768
)
(cherry picked from commit 719ead3a65
)
(cherry picked from commit 83e6f82e2a
)
(cherry picked from commit 494a429b21
)
(cherry picked from commit d30c90c0ab
)
(cherry picked from commit 3c83b325c4
)
(cherry picked from commit 470bffae63
)
(cherry picked from commit 1d65921719
)
(cherry picked from commit c101c2e0b9
)
2023-07-17 00:25:56 +02:00
Giteabot
026e745b9e
Fix incorrect release count ( #25879 ) ( #25887 )
...
Backport #25879 by @yp05327
Release count is not correct:
https://try.gitea.io/yp05327/testrepo/tags
![image](https://github.com/go-gitea/gitea/assets/18380374/07f97c62-d450-4ccb-b3f2-3e0af9d9fc52 )
https://try.gitea.io/yp05327/testrepo/releases
![image](https://github.com/go-gitea/gitea/assets/18380374/6f1d55a4-bb68-445d-84b9-90552a40f403 )
https://try.gitea.io/yp05327/testrepo/releases/tag/testtag
![image](https://github.com/go-gitea/gitea/assets/18380374/09ab5d51-52b6-4621-a571-3100198eb260 )
We already have correct release count, no need to calculate it again.
c5e187c389/modules/context/repo.go (L547)
Co-authored-by: yp05327 <576951401@qq.com>
2023-07-14 09:32:43 +00:00
Giteabot
c334be8284
Fix empty project displayed in issue sidebar ( #25802 ) ( #25854 )
...
Backport #25802 by @yp05327
You can confirm this issue in
https://try.gitea.io/yp05327/testrepo/issues/2
Before:
![image](https://github.com/go-gitea/gitea/assets/18380374/1ab476dc-2f9b-4c85-9e87-105fc73af1ee )
After:
![image](https://github.com/go-gitea/gitea/assets/18380374/786f984d-5c27-4eff-b3d9-159f68034ce4 )
This issue comes from the change in #25468 .
`LoadProject` will always return at least one record, so we use
`ProjectID` to check whether an issue is linked to a project in the old
code.
As other `issue.LoadXXX` functions, we need to check the return value
from `xorm.Session.Get`.
In recent unit tests, we only test `issueList.LoadAttributes()` but
don't test `issue.LoadAttributes()`. So I added a new test for
`issue.LoadAttributes()` in this PR.
Co-authored-by: yp05327 <576951401@qq.com>
Co-authored-by: Denys Konovalov <privat@denyskon.de>
2023-07-12 19:07:03 +02:00
Giteabot
052e65e63f
Fix incorrect oldest sort in project list ( #25806 ) ( #25835 )
...
Backport #25806 by @yp05327
sort type `oldest` should be `Asc`.
Added a test for this.
I see we have `SearchOrderBy` in db model, but we are using many
different ways to define the sort type.
~Maybe we can improve this later.~
↑ Improved in this PR
Co-authored-by: yp05327 <576951401@qq.com>
2023-07-12 13:22:17 +08:00
Giteabot
2b79d3fd52
For API attachments, use API URL ( #25639 ) ( #25814 )
...
Backport #25639 by @lunny
Fix #25257
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-10 12:56:16 +00:00
Giteabot
03cacf971e
Check `ctx.Written()` for `GetActionIssue` ( #25698 ) ( #25711 )
...
Backport #25698 by @wolfogre
Fix #25697 .
Just avoid panic, maybe there's another bug to trigger this case.
Co-authored-by: Jason Song <i@wolfogre.com>
2023-07-06 21:04:26 +02:00
Giteabot
04eea29ecb
Fix tags header and pretty format numbers ( #25624 ) ( #25694 )
...
Backport #25624 by @lunny
This casused by #23465
Before
release disabled
<img width="1320" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/190a1c81-daa5-41bc-91ac-c9a0bf629b5f ">
release enabled
<img width="1320" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/a0372c31-727c-4ee0-a6b9-30e502498d90 ">
After
release disabled
<img width="1304" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/a747ea80-a3d9-4792-8f6d-e8955da78b9e ">
release enabled
<img width="1290" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/7c0bc43a-9149-4148-859d-35839aeb60ca ">
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-05 07:08:16 +00:00
silverwind
24e64fe372
Replace `interface{}` with `any` ( #25686 ) ( #25687 )
...
Same perl replacement as https://github.com/go-gitea/gitea/pull/25686
but for 1.20 to ease future backporting.
2023-07-04 23:41:32 -04:00
Giteabot
5510ed34f1
Fix the nil pointer when assigning issues to projects ( #25665 ) ( #25677 )
...
Backport #25665 by @Zettat123
Fixes #25649
Caused by #25468
Co-authored-by: Zettat123 <zettat123@gmail.com>
2023-07-04 10:59:01 +00:00
Giteabot
9bbb4d8d6d
Improve loadprojects for issue list ( #25468 ) ( #25493 )
2023-06-26 02:06:58 +00:00
Giteabot
51789ba12d
Improve wiki sidebar and TOC ( #25460 ) ( #25477 )
...
Backport #25460 by @wxiaoguang
Close #20976
Close #20975
1. Fix the bug: the TOC in footer was incorrectly rendered as main
content's TOC
2. Fix the layout: on mobile, the TOC is put above the main content,
while the sidebar is put below the main content
3. Auto collapse the TOC on mobile
ps: many styles of "wiki.css" are moved from old css files, so leave
nits to following PRs.
### for desktop
![image](https://github.com/go-gitea/gitea/assets/2114189/6c84201c-0648-465a-99e6-c53cdaee53c0 )
### for mobile
![image](https://github.com/go-gitea/gitea/assets/2114189/9cb4fdfe-b6ab-4e6f-ae82-219ddb8fa27e )
### other changed pages
<details>
![image](https://github.com/go-gitea/gitea/assets/2114189/ef077736-2c3e-4e3d-82fe-d9bf1ebcca98 )
![image](https://github.com/go-gitea/gitea/assets/2114189/bb528429-ad5f-4258-a5c4-05f997c624ea )
</details>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-06-24 10:16:15 +08:00
Giteabot
203fe2841d
Fix `Permission` in API returned repository struct ( #25388 ) ( #25441 )
...
Backport #25388 by @wolfogre
The old code generates `structs.Repository.Permissions` with only
`access.Permission.AccessMode`, however, it should check the units too,
or the value could be incorrect. For example,
`structs.Repository.Permissions.Push` could be false even the doer has
write access to code unit.
Should fix
https://github.com/renovatebot/renovate/issues/14059#issuecomment-1047961128
(Not reported by it, I just found it when I was looking into this bug)
---
Review tips:
The major changes are
- `modules/structs/repo.go`
https://github.com/go-gitea/gitea/pull/25388/files#diff-870406f6857117f8b03611c43fca0ab9ed6d6e76a2d0069a7c1f17e8fa9092f7
- `services/convert/repository.go`
https://github.com/go-gitea/gitea/pull/25388/files#diff-7736f6d2ae894c9edb7729a80ab89aa183b888a26a811a0c1fdebd18726a7101
And other changes are passive.
Co-authored-by: Jason Song <i@wolfogre.com>
2023-06-22 17:01:42 +02:00