Loïc Dachary
0ec0e97b3b
[SECURITY] default to pbkdf2 with 320,000 iterations
...
(cherry picked from commit 3ea0b287d7db8392a8acbd2a5fa292235a91c4aeec12e54182d456d25d884a332f73d1d59b79a72c
2023-04-22 11:31:28 +02:00
Earl Warren
fc94f6fae2
[API] Forgejo API /api/forgejo/v1
...
(cherry picked from commit 20b56692691574643a6a22510f4130c3d85d84095ea23098514f3970e6c443a3a40825669cea25bbe25190d2b45df876e19e
2023-04-22 11:31:28 +02:00
Percy Ma
adea6be551
[DOCS] LICENSE: add Forgejo Authors
...
(cherry picked from commit 7c98a4c54e1ec4a8e6cf79de60a5d8e7fbfb34a95ad6bd26c2a1e51272f2ee319d6b64b930a6be12c51fed698a
2023-04-22 11:31:28 +02:00
Loïc Dachary
6b8fc4f437
[DOCS] RELEASE-NOTES.md
...
(cherry picked from commit b07123ee7bca85c880b4196a72c7ea5f84d3cbd43e4cdd4b3a99d10ba79cf8b8aecbb4
2023-04-22 11:31:28 +02:00
Loïc Dachary
3e7db01aa2
[WORKFLOW] issues & pr templates
...
(cherry picked from commit 9dd224f00c710af007bc2ccd6e2bd6b90dc5fc4f8f3431b54aa8aa50288b23c5258469bd29289fdbf763673a05
2023-04-22 11:31:28 +02:00
Loïc Dachary
7a243b2263
[DOCS] README
...
(cherry picked from commit a47b4745862fcc61c1d967debe2247b90ffbb3092af3b8d476a469c07cc310f848d6d91a364f5585d4e031cdab
2023-04-22 11:31:27 +02:00
Loïc Dachary
9c7208b3f6
[DOCS] CONTRIBUTING
...
Refs: https://codeberg.org/forgejo/forgejo/issues/8
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/153
Refs: https://codeberg.org/forgejo/forgejo/issues/123
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/299
(cherry picked from commit 08dcef0c8chttps://forgejo.org/docs/admin
Because the version is not displayed on the landing page of Forgejo,
there cannot be a link to a versionned documentation. There must exist
a link that points to the latest version on the website for the
forgejo instance to display.
Better but more complicated approaches could be to:
* Embed the documentation in Forgejo
* Allow the admin to not display the help
* Allow the admin to display a versionned help or not
(cherry picked from commit 83cc3892395df52b8a4f9a66b3d70b2a4d0bd1646577fad1c9d5b78a53feddc09375ca06015101a1
2023-04-22 11:31:27 +02:00
Loïc Dachary
a6a768de7d
delete Gitea specific files that need rewriting for Forgejo
...
Although it would be possible to modify these files, it would create
conflicts when rebasing. Instead, this commit removes them entirely
and another commit can start from scratch, borrowing content from the
original files.
The drawback of this approach is that some content updates from Gitea
that also need updating in Forgejo will have to be copy/pasted
instead of being merged.
(cherry picked from commit eb8578211534401f2004ef43b1c691d17fe25e2fc4f688fe544628d065344a2a956138b8f57065dfc4a1a695ff
2023-04-22 11:31:27 +02:00
Earl Warren
e4095c6abb
[CI] [v1.19] pin test_env:1.19
...
(cherry picked from commit 170f10627ca503e824f0
2023-04-22 09:10:55 +02:00
Loïc Dachary
c99026eb35
[CI] set PASSWORD_HASH_ALGO = argon2 for integration tests
...
(cherry picked from commit 1d7ce2a39c1abfc0c0a1823ab34c64095a5b0c88b0e5c7504a107f64a02ee76c50c95d6ebb567eb5
2023-04-22 09:10:55 +02:00
Loïc Dachary
6a5d91f36b
[CI] implementation: forgejo container images
...
(cherry picked from commit dd1971d4e63981dbaf8cb6ae4ba255e91c7e1fb67639646fb5737c6afa4a03ebf57f03e40c1dfbe18b5a02e79a
2023-04-22 09:10:55 +02:00
Loïc Dachary
61bcece963
[CI] implementation: Woodpecker based CI
...
(cherry picked from commit c2a7aaeee84277bdb741adebc446719a7332c2becf5e3b046ceec15a625e1d7d8f4565a6e1410f26
2023-04-22 09:10:55 +02:00
Loïc Dachary
a4bb93239d
[CI] implementation: publish forgejo- binaries instead of gitea-
...
(cherry picked from commit 6d910daafbd447861cc960071e20a90915c367ce9438f6e42290177a2b959f776eae48a3ec7ab1370623524e68
2023-04-22 09:10:54 +02:00
yp05327
5ccb626cda
Fix owner team access mode value in team_unit table ( #24224 )
...
Partly backport #23675
Co-authored-by: Giteabot <teabot@gitea.io>
2023-04-22 08:53:03 +02:00
Giteabot
b00f7c3c54
Fix access token issue on some public endpoints ( #24194 ) ( #24259 )
...
Backport #24194 by @harryzcy
- [x] Identify endpoints that should be public
- [x] Update integration tests
Fix #24159
Co-authored-by: harryzcy <harry@harryzheng.com>
2023-04-21 14:59:17 -04:00
Giteabot
51fd730147
Show commit history for closed/merged PRs ( #24238 ) ( #24261 )
...
Backport #24238 by @wxiaoguang
Close #24237
Before:
<details>
</details>
After:
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-21 14:15:00 -04:00
Giteabot
7117355169
Fix label color, fix divider in dropdown ( #24215 ) ( #24244 )
...
Backport #24215 by @silverwind
Two small CSS fixes:
1. Fix basic primary label hover:
Before:
<img width="172" alt="Screenshot 2023-04-19 at 20 00 32"
src="https://user-images.githubusercontent.com/115237/233161903-eec2de54-1a58-44ac-a6ef-2d77157317f6.png ">
After:
<img width="179" alt="Screenshot 2023-04-19 at 20 05 29"
src="https://user-images.githubusercontent.com/115237/233162028-995404ac-5852-4d03-821f-6eb4a918a9e3.png ">
2. Fix border color of divider in dropdown and remove margin so it looks
better with hover effect, as discussed in
https://github.com/go-gitea/gitea/pull/24143 :
<img width="205" alt="Screenshot 2023-04-19 at 20 03 24"
src="https://user-images.githubusercontent.com/115237/233162102-3f4a4142-9634-4c95-acf0-be57072ce7eb.png ">
<img width="311" alt="Screenshot 2023-04-19 at 20 03 55"
src="https://user-images.githubusercontent.com/115237/233162109-faa616f6-02e4-43d3-95fa-66787a7f914c.png ">
Co-authored-by: silverwind <me@silverwind.io>
2023-04-20 22:28:55 -05:00
wxiaoguang
d5f2c9d74d
Fix issue attachment handling ( #24202 ) ( #24221 )
...
Backport #24202
Close #24195
Fix the bug:
1. The old code doesn't handle `removedfile` event correctly
2. The old code doesn't provide attachments for type=CommentTypeReview
---------
Co-authored-by: silverwind <me@silverwind.io>
2023-04-20 04:21:10 -04:00
yp05327
95c2cb4b79
Add run status in action view page ( #24223 )
...
Backport #23212
2023-04-20 09:24:50 +02:00
Giteabot
7d717e22a8
Vertical widths of containers removed ( #24184 ) ( #24211 )
...
Backport #24184 by @krzysztofjeziorny
A vertical overflow appears in Firefox 112/MacOS 12.6 when the system
setting for scrollbars is to "Always" show them.
Here, the fixed 100vw container widths are removed, which removes the
overflow. It is, however, only simulated in Developer Tools in latest
Firefox and Chromium, so please test on a Gitea installation.
Co-authored-by: Krzysztof Jeziorny <872730+krzysztofjeziorny@users.noreply.github.com>
2023-04-20 09:02:38 +08:00
Giteabot
dc66ceadac
Don't list root repository on compare page if pulls not allowed ( #24183 ) ( #24210 )
...
Backport #24183 by @lunny
Fix #24165
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-19 19:07:47 -04:00
Giteabot
8cd5483e8a
Fix template error in pull request with deleted head repo ( #24192 ) ( #24216 )
...
Backport #24192 by @brechtvl
Rendering of Allow Edits from Maintainers did not check if the head repo
exists, while other parts of the page handle it gracefully.
Co-authored-by: Brecht Van Lommel <brecht@blender.org>
2023-04-19 17:20:19 -04:00
Giteabot
2e6e5bc9c9
Fix incorrect CORS default values ( #24206 ) ( #24217 )
...
Backport #24206 by @wxiaoguang
Document:
```
;ALLOW_DOMAIN = *
;METHODS = GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS
```
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-19 16:23:25 -04:00
Giteabot
f134229bf2
Use correct locale key for forks page ( #24172 ) ( #24175 )
...
Backport #24172 by @jolheiser
4014200021/options/locale/locale_en-US.ini (L873)4014200021/options/locale/locale_en-US.ini (L943)
2023-04-17 17:21:53 -04:00
Giteabot
3d3c740636
Fix Org edit page bugs: renaming detection, maxlength ( #24161 ) ( #24171 )
...
Backport #24161 by @wxiaoguang
## Before
* The renaming detection is wrong (eg: pasting a new name into the input
doesn't trigger the detection)
* The renaming prompt layout is not good
* Some MaxSize/maxlength rules is missing
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-17 12:20:47 -04:00
Giteabot
c4f569b9a5
Support converting varchar to nvarchar for mssql database ( #24105 ) ( #24168 )
...
Backport #24105 by @lunny
In #12269 , all string fields of struct will generate a NVARCHAR column
in database, but for those Gitea instances installed before that PR,
users have to convert columns themselves.
In this PR, we update the `./gitea admin convert` commands to support
both MySQL and MSSQL database converting. Previously, it only supported
converting `utf8 -> utf8mb4` for MySQL.
Now, it will check the database types.
If it's MSSQL, it will convert `VARCHAR -> NVARCHAR` as well.
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-17 10:10:15 -04:00
wxiaoguang
03b6e7900b
Use 1.18's aria role for dropdown menus ( #24144 ) ( #24155 )
...
Backport #24144
Co-authored-by: silverwind <me@silverwind.io>
2023-04-17 07:02:09 -04:00
Patrick Schratz
463e144d97
Update redis library to support redis v7 ( #24114 ) ( #24156 )
...
backports #24114
---------
Co-authored-by: techknowlogick <hello@techknowlogick.com>
2023-04-17 02:34:59 -04:00
wxiaoguang
2b32f8b95f
Sort repo topic labels by name ( #24123 ) ( #24153 )
...
Backport #24123
Close #24077
Manually backported and tested.
<img width="330" alt="image"
src="https://user-images.githubusercontent.com/2114189/232283645-92cc85dd-ba16-44a9-a7ef-5712b9d285e9.png ">
2023-04-17 09:00:19 +08:00
wxiaoguang
94fbd44bac
Set EasyMDE heading font-size to the same size as the resulting markdown ( #24151 ) ( #24152 )
...
Backport #24151
Fix #23816
<img width="519" alt="image"
src="https://user-images.githubusercontent.com/2114189/232283304-21f56e82-d80e-4199-9b14-74699d80cd20.png ">
2023-04-16 17:34:19 -04:00
Giteabot
494e373292
Fix 2-dot direct compare to use the right base commit ( #24133 ) ( #24150 )
...
Backport #24133 by @jtran
For 2-dot direct compare, we should use the base commit in the title and
templates, as is used elsewhere, not the common ancestor which is used
for 3-dot compare. I believe that this change should have been included
in #22949 .
Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
2023-04-16 13:17:13 +02:00
sillyguodong
10f93995e9
Highlight selected file in the PR file tree ( #23947 ) ( #24126 )
...
backport #23947 by @yusifeng
before
after
Co-authored-by: yusifeng <36984894+yusifeng@users.noreply.github.com>
2023-04-14 17:54:22 +08:00
Giteabot
67a73dd05f
Fix incorrect server error content in RunnersList ( #24118 ) ( #24121 )
...
Backport #24118 by @yp05327
Co-authored-by: yp05327 <576951401@qq.com>
2023-04-14 12:52:21 +08:00
Zettat123
893c97dd71
Fix mismatch between hook events and github event types ( #24048 ) ( #24091 )
...
Backport https://github.com/go-gitea/gitea/pull/24048
Some workflow trigger events can have multiple activity types, such as
`issues` and `pull_request`, and user can specify which types can
trigger the workflow. See GitHub documentation:
https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows
Now some hook events cannot match the workflow trigger events correctly
because we don't check the activity types. For example,
`pull_request_label` is an individual hook event. But there isn't a
`pull_request_label` workflow trigger event, we can only use
`pull_request` event's `label` activity type. If we don't check the
activity types, the workflows without the `label` activity type may be
triggered by the `pull_request_label` event by mistake. We need to
improve the match logic.
- [x] [`issues`
](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issues )
- [x]
[`issue_comment`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issue_comment )
- [x]
[`pull_request`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request )
- [x]
[`pull_request_review`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_review )
- [x]
[`pull_request_review_comment`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_review_comment )
- [x]
[`release`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release )
- [x]
[`registry_package`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#registry_package )
2023-04-13 15:19:41 +08:00
6543
447fa6715c
Changelog v1.19.1 ( #24079 )
2023-04-13 03:38:06 +02:00
wxiaoguang
2398a23562
Backport locales to 1.19 ( #24083 )
...
Backport locales
Generated by `go run build/backport-locales.go release/v1.19`
2023-04-12 17:07:43 -04:00
Giteabot
93c7611c32
Improve LFS error logs ( #24072 ) ( #24082 )
...
Backport #24072 by @wxiaoguang
The error logs were not clear.
Help (but not fix) #24053
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-12 16:23:57 -04:00
Giteabot
607801ec41
Update the value of the diffEnd when click Show More btn in the DiffFileTree ( #24069 ) ( #24078 )
...
Backport #24069 by @sillyguodong
In the component `DiffFileTree`,if don't update the value of the
`diffEnd` in the callback of ajax request, click `Show More` btn will
always return the same response, duplicate files are appended to the
file list.
Before:
https://user-images.githubusercontent.com/33891828/231371188-82d169af-10bb-47e2-8aca-83ced2597f2d.mov
After:
https://user-images.githubusercontent.com/33891828/231369805-39a5a4d0-662c-4f08-bc5a-7d31e8782453.mov
Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
2023-04-12 15:27:53 -04:00
wxiaoguang
16d2cf05ab
Fix custom mailer template on Windows ( #24081 )
...
Fix #24075
Fix #23873
From the log:
```
2023/04/02 19:41:46 .../templates/mailer.go:68:1() [T] Adding mailer template for \issue\default from "C:\gitea\custom\templates\mail\issue\default.tmpl"
```
That `assetName ` on Windows is wrong. Gitea only uses slash `/`.
2023-04-12 12:16:40 -04:00
wxiaoguang
d562b419b6
Make label templates have consistent behavior and priority ( #23749 ) ( #24071 )
...
Backport #23749
Fix https://github.com/go-gitea/gitea/issues/23715
Backported manually and tested manually.
2023-04-12 16:05:10 +02:00
Hester Gong
5482602ba8
Add cardtype to org/user level project on creation, edit and view ( #24043 ) ( #24066 )
...
Backport #24043
Part of #23318
The way to fix the missing cardtype for user/org level projects in this
PR is to port the cardtype related part from #22112 to org/user level
projects' template and router functions.
Before:
<img width="1135" alt="截屏2023-04-11 13 55 49"
src="https://user-images.githubusercontent.com/17645053/231069068-ba897129-ae90-4aa0-9b0f-468bf5c65375.png ">
<img width="1131" alt="截屏2023-04-11 13 55 59"
src="https://user-images.githubusercontent.com/17645053/231069084-279f6681-5a10-42da-b5a8-2b0ba47c7078.png ">
After:
Create
<img width="835" alt="截屏2023-04-11 13 27 16"
src="https://user-images.githubusercontent.com/17645053/231064445-0d6e12bd-5725-48db-a102-80e7472757c2.png ">
Edit
<img width="852" alt="截屏2023-04-11 13 27 05"
src="https://user-images.githubusercontent.com/17645053/231064503-c70525cd-1038-43ec-8d93-8b8d95d183d4.png ">
View
<img width="1329" alt="截屏2023-04-11 13 26 56"
src="https://user-images.githubusercontent.com/17645053/231064529-26023c85-698b-4b2e-af02-45f9820c77ec.png ">
---------
Co-authored-by: silverwind <me@silverwind.io>
2023-04-12 08:23:05 -04:00
Giteabot
37d3e0ec33
Fix accidental overwriting of LDAP team memberships ( #24050 ) ( #24065 )
...
Backport #24050 by @sillyguodong
In the `for` loop, the value of `membershipsToAdd[org]` and
`membershipsToRemove[org]` is a slice that should be appended instead of
overwritten.
Due to the current overwrite, the LDAP group sync only matches the last
group at the moment.
## Example reproduction
- an LDAP user is both a member of
`cn=admin_staff,ou=people,dc=planetexpress,dc=com` and
`cn=ship_crew,ou=people,dc=planetexpress,dc=com`.
- configuration of `Map LDAP groups to Organization teams ` in
`Authentication Sources`:
```json
{
"cn=admin_staff,ou=people,dc=planetexpress,dc=com":{
"test_organization":[
"admin_staff",
"test_add"
]
},
"cn=ship_crew,ou=people,dc=planetexpress,dc=com":{
"test_organization":[
"ship_crew"
]
}
```
- start `Synchronize external user data` task in the `Dashboard`.
- the user was only added for the team `test_organization.ship_crew`
Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
2023-04-12 07:22:02 -04:00
Denys Konovalov
29724f31c5
Refactor commit status for Actions jobs ( #23786 ) ( #24060 )
...
Backport #23786
Refactor commit status for Actions jobs (#23786 )
Highlights:
- Treat `StatusSkipped` as `CommitStatusSuccess` instead of
`CommitStatusFailure`, so it fixed #23599 .
- Use the bot user `gitea-actions` instead of the trigger as the creator
of commit status.
- New format `<run_name> / <job_name> / (<event>)` for the context of
commit status to avoid conflicts.
- Add descriptions for commit status.
- Add the missing calls to `CreateCommitStatus`.
- Refactor `CreateCommitStatus` to make it easier to use.
Co-authored-by: Jason Song <i@wolfogre.com>
2023-04-11 22:37:34 -04:00
Giteabot
580da8f353
Fix branch protection priority ( #24045 ) ( #24061 )
...
Backport #24045 by @lunny
Fix #24044
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-11 21:07:38 +02:00
Giteabot
8644993699
Update documentation to explain which projects allow Gitea to host static pages ( #23993 ) ( #24058 )
...
Backport #23993 by @6543
close #23521
Signed-off-by: 6543 <6543@obermui.de>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: a1012112796 <1012112796@qq.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-04-11 18:43:35 +02:00
Jason Song
f55fe989a4
Use actions job link as commit status URL instead of run link ( #24023 ) ( #24032 )
...
Backport #24023 .
A commit status is bound to a job, not a run.
2023-04-10 08:46:36 -05:00
Giteabot
27dbe97542
Add actions support to package auth verification ( #23729 ) ( #24028 )
...
Backport #23729 by @yp05327
Partly fixes https://github.com/go-gitea/gitea/issues/23642
Error info:
ActionsUser (userID -2) is used to login in to docker in action jobs.
Due to we have no permission policy settings of ActionsUser now,
ActionsUser can only access public registry by this quick fix.
Co-authored-by: yp05327 <576951401@qq.com>
2023-04-10 10:36:21 +02:00
Giteabot
abf0386e2e
Fix protected branch for API ( #24013 ) ( #24027 )
...
Backport #24013 by @lunny
Fix #23998
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-10 14:48:02 +08:00
Giteabot
2b10eebed8
Show errors for KaTeX and mermaid on the preview tab ( #24009 ) ( #24019 )
...
Backport #24009 by @silverwind
There is a conflicting fomantic rule that hid the error messages inside
the markdown preview tab for things like mermaid or katex. Overruled it
to always show these errors.
<img width="774" alt="image"
src="https://user-images.githubusercontent.com/115237/230738528-322814c1-8994-495e-b901-bbb79b924ccb.png ">
Co-authored-by: silverwind <me@silverwind.io>
2023-04-09 08:48:28 -04:00
Giteabot
695738fb31
Show protected branch rule names again ( #23907 ) ( #24018 )
...
Backport #23907 by @HesterG
`!important`s for one of the primary label selectors are removed by
#23774 , so the repository branch protection settings ui will not have
the demanding css. This PR modifies `.ui.primary.label` to fix it.
Before:
<img width="1408" alt="飞书20230404-115410"
src="https://user-images.githubusercontent.com/17645053/229683221-ef9c7d5c-68a8-42b0-ba19-ef2d5dfce5f9.png ">
After:
<img width="1419" alt="截屏2023-04-04 11 56 32"
src="https://user-images.githubusercontent.com/17645053/229683469-70cfc92d-d7ef-4323-a7f5-2247810fabce.png ">
Co-authored-by: Hester Gong <hestergong@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-04-09 14:06:16 +02:00
