magic_rb/forgejo
Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-30 22:06:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
16134 commits 12 branches 235 tags 604 MiB
Commit graph

16134 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Earl Warren 3380217da1
[TESTS] tests.AddFixtures helper loads additional per-test fixtures 
(cherry picked from commit 93a844dd13)
(cherry picked from commit 6d6d1a121c)
(cherry picked from commit 8b101f2860)
(cherry picked from commit 3e56212d6d)
(cherry picked from commit 4f619bc585)
 2023-11-25 08:08: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 1e5940b020
test POST /{username}/{reponame}/{type:issues|pulls}/move_pin 
(cherry picked from commit 52f50792606a22cbf1e144e1bd480984abf6f53f)
 2023-11-25 08:08:37 +01:00
Loïc Dachary 5322136af8
fix GET /api/v1/repos/{owner}/{repo}/keys/{id} 
(cherry picked from commit 768238d9f9982e99ad4cbf3942d2d2db5126a150)

Conflicts:
	routers/api/v1/repo/key.go
	trivial context conflict
 2023-11-25 08:08:37 +01:00
Loïc Dachary d095e4fdc5
test GET /api/v1/repos/{owner}/{repo}/keys/{id} 
(cherry picked from commit f5ad29dbc77df834a3b5b9a63b19bca680a9f5ed)
 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 d7b11f5378
test POST /{username}/{reponame}/{tags,release}/delete 
(cherry picked from commit 78dcbb62fe87abe044034d880c9e8c22b44c2c98)
 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 4903135a93
test GET /{owner}/{repo}/comments/{id}/attachments 
(cherry picked from commit 888dda12cf9bc95f9ef85ba5a518cf40152e07ea)
 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 0d7893ca8a
test POST /{owner}/{repo}/comments/{id} 
(cherry picked from commit 61db02681a024220d6d2fe61c1479fd03cb341ea)
 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
Loïc Dachary d2c16d9c2d
test POST /{owner}/{repo}/comments/{id}/delete 
(cherry picked from commit 02da8922f1d9ea8e0985b10a3003315f57b14b46)
 2023-11-25 07:23:34 +01:00
Loïc Dachary 0b0b506b74
fix DELETE /api/v1/repos/{owner}/{repo}/issues/comments/{id} 
(cherry picked from commit 521eed2312f45bef7de28c9c03c04257862a453c)
 2023-11-25 07:23:34 +01:00
Loïc Dachary 939a66e25c
test DELETE /api/v1/repos/{owner}/{repo}/issues/comments/{id} 
(cherry picked from commit 11dcaa7ec84bcb2931bfe001d4c6a02c5af4ec5b)
 2023-11-25 07:23:33 +01:00
Loïc Dachary 585f74c2ca
fix GET /repos/{owner}/{repo}/issues/comments/{id}/reactions 
(cherry picked from commit a146e3d0f9ff8ac1aee4be8a3632c76b35fc3482)
 2023-11-25 07:23:33 +01:00
Loïc Dachary 2af5a75d71
test GET /repos/{owner}/{repo}/issues/comments/{id}/reactions 
(cherry picked from commit 58d923ccbaad1ec12120800b28dbfe6c8c225556)
 2023-11-25 07:23:33 +01:00
Loïc Dachary 685ebdba63
fix {DELETE,POST} /repos/{owner}/{repo}/issues/comments/{id}/reactions 
(cherry picked from commit f499075c53752f983c6e4f8af17c449926ba94d9)
 2023-11-25 07:23:33 +01:00
Loïc Dachary f59a6cc0e4
test {DELETE,POST} /repos/{owner}/{repo}/issues/comments/{id}/reactions 
(cherry picked from commit ffcd2e79ac3ef63cd33d3ca9a18dae5f16431e54)
 2023-11-25 07:23:33 +01:00
Loïc Dachary e02448bbf5
test GET /api/v1/repos/{owner}/{repo}/issues/comments/{id}/assets/{attachment_id} 
via getIssueCommentSafe

(cherry picked from commit 9a11049715f1194cad777d5dde0ee514fa15d1f1)
 2023-11-25 07:23:33 +01:00
Loïc Dachary e291ea5e33
fix PATCH /api/v1/repos/{owner}/{repo}/issues/comments/{id} 
(cherry picked from commit 51c280e877765efe721e607aa95bcbb5aef364e0)
 2023-11-25 07:23:33 +01:00
Loïc Dachary 8726ce2635
test PATCH /api/v1/repos/{owner}/{repo}/issues/comments/{id} 
(cherry picked from commit 362f340ed9ee28627140ca06dd7487a8989ef62b)
 2023-11-25 07:23:33 +01:00
Loïc Dachary 3ddfca10ac
fix API usage of a PR index in place of issue index and vice versa 
(cherry picked from commit 7b95266de083c8de0ff224530a9b69e82c52c344)
 2023-11-25 07:23:32 +01:00
Loïc Dachary 6b4cb070cc
enforce reqRepoReader(unit.TypeIssues) POST /repos/{owner}/{repo}/issues 
(cherry picked from commit d3db2fa8bc85e9d67f30854bba0a4c1e8b57b015)
 2023-11-25 07:23:32 +01:00
Loïc Dachary c70eb32280
enforce reqRepoReader(unit.TypeIssues) GET /repos/{owner}/{repo}/issues/pinned 
(cherry picked from commit 00fad97fc1b27db40a002c9ab3f709d04dc2cdd1)
 2023-11-25 07:23:32 +01:00
Giteabot c0ccd4c2d7
Fix no ActionTaskOutput table waring (#28149) (#28151) 
Backport #28149 by @yp05327

Reproduce:
- Create a new Gitea instance
- Register a runner
- Create a repo and add a workflow
- Check the log, you will see warnings:

![image](https://github.com/go-gitea/gitea/assets/18380374/5f1278e0-114b-48bc-8113-8ba1404d9975)
It comes from:

![image](https://github.com/go-gitea/gitea/assets/18380374/c2807831-e137-4229-9536-87f6114c8a5b)

The reason is that we forgot registering `ActionTaskOutput` model.
So `action_table_output` table will be missing in your db.

Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit 41b2d0be93)
 2023-11-22 17:23:43 +01:00
Giteabot f302373eb4
Restricted users only see repos in orgs which their team was assigned to (#28025) (#28050) 
Backport #28025 by @6543

---
*Sponsored by Kithara Software GmbH*

Co-authored-by: 6543 <m.huber@kithara.com>
(cherry picked from commit 439e071acf)
 2023-11-22 17:23:33 +01:00
Loïc Dachary 5d18f4b19f
[BRANDING] X-Forgejo-OTP can be used instead of X-Gitea-OTP 
(cherry picked from commit 7b0549cd70)
(cherry picked from commit 13e10a65d9)
(cherry picked from commit 65bdd73cf2)
(cherry picked from commit 64eba8bb92)
(cherry picked from commit 4c49b1a759)
(cherry picked from commit 93b4d06406)
(cherry picked from commit e2bc5f36d9)
(cherry picked from commit 2bee76f9df)
(cherry picked from commit 3d8a1b4a9f)
(cherry picked from commit 99dd092cd0)
(cherry picked from commit 0fdbd02204)
(cherry picked from commit 70b277a183)
(cherry picked from commit 3eece7fbb4)
(cherry picked from commit 4838fc9e11)
(cherry picked from commit b76ed541cf)
(cherry picked from commit dcdfb5b65c)
(cherry picked from commit 377dc48cdc)
(cherry picked from commit acc862f411)
(cherry picked from commit ac75ef101f)
(cherry picked from commit 08f2d9f7c5)
(cherry picked from commit e4096f0b64)
(cherry picked from commit bf5876f062)
(cherry picked from commit 7dc60637e5)
(cherry picked from commit ef3101774b)
(cherry picked from commit ecb9e8867c)
(cherry picked from commit 64f0ae72fe)
(cherry picked from commit 8dd6ec7862)
(cherry picked from commit b36723e52b)

Conflicts:
	modules/context/api.go
	https://codeberg.org/forgejo/forgejo/pulls/1466
(cherry picked from commit 5c378e0cb8)
(cherry picked from commit 1d87602819)
(cherry picked from commit 0f72002d66)
(cherry picked from commit da2556eb13)
(cherry picked from commit c01688cd90)
(cherry picked from commit af4bba8329)
(cherry picked from commit 33ca322c2e)

Conflicts:
	modules/context/api.go
	https://codeberg.org/forgejo/forgejo/pulls/1739
(cherry picked from commit c18e374d44)
(cherry picked from commit 27c4797c9f)
 2023-11-14 13:17:12 +01:00
Giteabot d7408d8b0b
Dont leak private users via extensions (#28023) (#28028) 
Backport #28023 by @6543

there was no check in place if a user could see a other user, if you
append e.g. `.rss`

(cherry picked from commit 69ea554e23)
 2023-11-14 13:17:12 +01:00
Nanguan Lin 6dfe993913
Fix wrong xorm Delete usage(backport for 1.20) (#28003) 
manually backport for https://github.com/go-gitea/gitea/pull/27995
The conflict is `ctx` and `db.Defaultctx`.

(cherry picked from commit c077a084d7)
 2023-11-14 13:17:12 +01:00
Giteabot 1bbc1adcdc
Render email addresses as such if followed by punctuation (#27987) (#27991) 
Backport #27987 by @yardenshoham

Added the following characters to the regular expression for the email:

- ,
- ;
- ?
- !

Also added a test case.

- Fixes #27616

# Before

![image](https://github.com/go-gitea/gitea/assets/20454870/c57eac26-f281-43ef-a51d-9c9a81b63efa)

# After

![image](https://github.com/go-gitea/gitea/assets/20454870/fc7d5c08-4350-4af0-a7f0-d1444d2d75af)

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: Yarden Shoham <git@yardenshoham.com>
(cherry picked from commit dfd960f22a)
 2023-11-14 13:17:12 +01:00
Nanguan Lin d610ea3fbb
Remove duplicated button in Install web page (#27941) 
Fix #27934
Regression #25648

(cherry picked from commit 2978b435bb)
 2023-11-14 13:17:12 +01:00
KN4CK3R 44df78edd4
Unify two factor check (#27915) (#27939) 
Backport of #27915

Fixes #27819

We have support for two factor logins with the normal web login and with
basic auth. For basic auth the two factor check was implemented at three
different places and you need to know that this check is necessary. This
PR moves the check into the basic auth itself.

(cherry picked from commit 00705da102)
 2023-11-14 13:17:12 +01:00
Giteabot 1fd3cc3217
Fix DownloadFunc when migrating releases (#27887) (#27889) 
Backport #27887 by @Zettat123

We should not use `asset.ID` in DownloadFunc because DownloadFunc is a
closure.

1bf5527eac/services/migrations/gitea_downloader.go (L284-L295)

A similar bug when migrating from GitHub has been fixed in #14703. This
PR fixes the bug when migrating from Gitea and GitLab.

Co-authored-by: Zettat123 <zettat123@gmail.com>
(cherry picked from commit 4a48370d91)
 2023-11-14 13:17:12 +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 713652e3d8
Fix package webhook (#27839) (#27854) 
Backport #27839 by @lunny

Fix #23742

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
(cherry picked from commit 2147bfde05)
 2023-11-14 13:17:12 +01:00
Lunny Xiao b4fb797b32
Revert "fix orphan check for deleted branch (#27310) (#27320)" (#27763) 
Because branch table is created until 1.21
Fix #27508

(cherry picked from commit a1c232cae3)
 2023-11-14 13:17:12 +01:00
Giteabot 2a5d5da930
Fix label render containing invalid HTML (#27752) (#27761) 
Backport #27752 by @earl-warren

- The label HTML contained a quote that wasn't being closed.

Refs: https://codeberg.org/forgejo/forgejo/pulls/1651

(cherry picked from commit e2bc2c9a1f)

Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com>
Co-authored-by: Gusted <postmaster@gusted.xyz>
(cherry picked from commit 63512cd15d)
 2023-11-14 13:17:12 +01:00
Giteabot 64373004b5
Fix org team endpoint (#27721) (#27729) 
Backport #27721 by @lng2020

Fix #27711

Co-authored-by: Nanguan Lin <70063547+lng2020@users.noreply.github.com>
(cherry picked from commit 71803d33e3)
 2023-11-14 13:17:11 +01:00
Giteabot 2a321fcfda
Adapt .changelog.yml to new labeling system (#27701) (#27708) 
Backport #27701 by @delvh

Otherwise, it is not possible anymore to generate changelogs.

Co-authored-by: delvh <dev.lh@web.de>
(cherry picked from commit a954cc3fb9)
 2023-11-14 13:17:11 +01:00
Giteabot d6798ae015
Support allowed hosts for webhook to work with proxy (#27655) (#27674) 
Backport #27655 by @wolfogre

When `webhook.PROXY_URL` has been set, the old code will check if the
proxy host is in `ALLOWED_HOST_LIST` or reject requests through the
proxy. It requires users to add the proxy host to `ALLOWED_HOST_LIST`.
However, it actually allows all requests to any port on the host, when
the proxy host is probably an internal address.

But things may be even worse. `ALLOWED_HOST_LIST` doesn't really work
when requests are sent to the allowed proxy, and the proxy could forward
them to any hosts.

This PR fixes it by:

- If the proxy has been set, always allow connectioins to the host and
port.
- Check `ALLOWED_HOST_LIST` before forwarding.

Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit ca4418eff1)
 2023-11-14 13:17:11 +01:00
Giteabot cf1174acbf
Fix poster is not loaded in get default merge message (#27657) (#27665) 
Backport #27657 by @lunny

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 80c0c88152)
 2023-11-14 13:17:11 +01:00
Giteabot 62c33f92a9
Fix 404 when deleting Docker package with an internal version (#27615) (#27629) 
Backport #27615 by @lng2020

close #27601
The Docker registry has an internal version, which leads to 404

Co-authored-by: Nanguan Lin <70063547+lng2020@users.noreply.github.com>
(cherry picked from commit 171950a0d4)
 2023-11-14 13:17:11 +01:00
Giteabot f142ae18c0
Fix attachment download bug (#27486) (#27570) 
Backport #27486 by @lunny

Fix #27204

This PR allows `/<username>/<reponame>/attachments/<uuid>` access with
personal access token and also changed attachments API download url to
it so it can be download correctly.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 7b96f71bc7)
 2023-11-14 13:17:11 +01:00
yp05327 2e50870688
Avoid run change title process when the title is same (#27467) (#27557) 
Backport #27467 manually.

(cherry picked from commit e6d1afaee3)
 2023-11-14 13:17:11 +01:00
silverwind 2716e2f626
Fix mermaid flowchart margin issue (#27503) (#27517) 
Backport https://github.com/go-gitea/gitea/pull/27503 to 1.20

Fixes: https://github.com/go-gitea/gitea/issues/27435
Related: https://github.com/mermaid-js/mermaid/issues/4907

<img width="924" alt="image"

src="https://github.com/go-gitea/gitea/assets/115237/494a1d2e-4c56-48d0-9843-82a5e5aa977e">

(cherry picked from commit 1d4c193df5)
 2023-11-14 13:17:11 +01:00