09814117e3
Add changelog for 1.20.2 ( #26208 ) ( #26217 )
...
Backport #26208 by @delvh
Co-authored-by: delvh <dev.lh@web.de >
Co-authored-by: techknowlogick <matti@mdranta.net >
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-29 19:23:54 +08:00
499c5594c3
Fix allowed user types setting problem ( #26200 ) ( #26206 )
...
Backport #26200 by @lunny
Fix #25951
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com >
2023-07-29 14:42:40 +08:00
ecfbcced46
Prevent primary key update on migration ( #26192 ) ( #26199 )
...
Backport #26192 by @KN4CK3R
Fixes #25918
The migration fails on MSSQL because xorm tries to update the primary
key column. xorm prevents this if the column is marked as auto
increment:
https://gitea.com/xorm/xorm/src/commit/c622cdaf893fbfe3f40a6b79f6bc17ee10f53865/internal/statements/update.go#L38-L40
I think it would be better if xorm would check for primary key columns
here because updating such columns is bad practice. It looks like if
that auto increment check should do the same.
fyi @lunny
Co-authored-by: KN4CK3R <admin@oldschoolhack.me >
2023-07-28 11:08:11 +02:00
Giteabot and GitHub
892e24aaf1
Calculate MAX_WORKERS default value by CPU number ( #26177 ) ( #26183 )
2023-07-27 19:24:07 +08:00
54614767a2
Fix handling of plenty Nuget package versions ( #26075 ) ( #26173 )
...
Backport #26075 by @KN4CK3R
Fixes #25953
- Do not load full version information (v3)
- Add pagination support (v2)
Co-authored-by: KN4CK3R <admin@oldschoolhack.me >
2023-07-26 21:41:40 +00:00
e42c5afadb
Fix typos in Contributing.md ( #26170 ) ( #26172 )
...
Co-authored-by: Niko Hoffrén <niko.hoffren@gmail.com >
2023-07-26 14:46:13 -05:00
72b55c8094
Update email-setup.en-us.md ( #26068 ) ( #26166 )
...
Backport #26068 by @felixvictor
The setting `MAILER_TYPE` is deprecated.
According to the config cheat sheet, it should be `PROTOCOL`.
Co-authored-by: Felix Victor <felix.victor.na@gmail.com >
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com >
2023-07-26 10:55:27 -05:00
a12d036a68
Fix bugs in LFS meta garbage collection ( #26122 ) ( #26157 )
...
Backport #26122 by @Zettat123
This PR
- Fix #26093 . Replace `time.Time` with `timeutil.TimeStamp`
- Fix #26135 . Add missing `xorm:"extends"` to `CountLFSMetaObject` for
LFS meta object query
- Add a unit test for LFS meta object garbage collection
Co-authored-by: Zettat123 <zettat123@gmail.com >
2023-07-26 11:53:15 +00:00
65d6bdf0be
Fix UI regression of asciinema player ( #26159 ) ( #26162 )
...
Backport #26159 by @wolfogre
It was caused by updating `asciinema-player`, the upstream changed the
CSS class prefix:
`https://github.com/asciinema/asciinema-player/commit/40505e479e8ba6833f178a3b7e85503c72491614 `
<details>
<summary>Before:</summary>
<img width="1320" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/b91a2cf5-c1da-43d6-bac2-bc278728b11e ">
</details>
<details>
<summary>After:</summary>
<img width="1311" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/c9872d25-e0bb-43d4-8b1e-d87c6b03c0a2 ">
</details>
Co-authored-by: Jason Song <i@wolfogre.com >
2023-07-26 12:34:55 +02:00
a8445e9320
Remove "misc" scope check from public API endpoints ( #26134 ) ( #26149 )
...
Backport #26134 by @wxiaoguang
Fix #26035
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-26 05:32:41 +00:00
0f73be0ae3
Fix LFS object list style ( #26133 ) ( #26147 )
...
Backport #26133 by @wxiaoguang
Close #26104 . Only a quick fix, the UI is not perfect.
Before:
<details>
</details>
After:
<details>
</details>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-26 12:58:48 +08:00
Giteabot and GitHub
43213b816d
Fix CLI allowing creation of access tokens with existing name ( #26071 ) ( #26144 )
...
Backport #26071 by @yardenshoham
We are now:
- Making sure there is no existing access token with the same name
- Making sure the given scopes are valid (we already did this before but
now we have a message)
The logic is mostly taken from
https://github.com/go-gitea/gitea/blob/a12a5f3652c339b17b187ff424a480631a3c1e1e/routers/api/v1/user/app.go#L101-L123
Closes #26044
Signed-off-by: Yarden Shoham <git@yardenshoham.com >
2023-07-26 01:30:50 +00:00
a55924aaf4
Increase table cell horizontal padding ( #26140 ) ( #26142 )
...
Backport #26140 by @silverwind
Extract from https://github.com/go-gitea/gitea/pull/26043 , just the
padding increase.
Before and After (hard to notice, but it's there):
<img width="427" alt="Screenshot 2023-07-25 at 19 37 12"
src="https://github.com/go-gitea/gitea/assets/115237/9543dcda-eccb-4739-b7dd-06b076108ab4 ">
<img width="420" alt="Screenshot 2023-07-25 at 19 37 26"
src="https://github.com/go-gitea/gitea/assets/115237/0a9c3724-81a1-4c67-a13b-4b728a51fc3a ">
Co-authored-by: silverwind <me@silverwind.io >
2023-07-26 00:42:23 +00:00
782b137682
Fix incorrect router logger ( #26137 ) ( #26143 )
...
Backport #26137 by @wxiaoguang
A low-level mistake:
* `log.Info` is global `Info` function, which calls "default" logger
* `logger.Info` is the for router's logger
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-26 08:37:43 +08:00
5992365fc1
added ssh mirror workaround description ( #26096 ) ( #26136 )
...
Backport #26096 by @thigg
related #1635 #18159
This will probably be obsolete at some point, but it should not break
anything and it may help some users
Co-authored-by: thigg <thigg@users.noreply.github.com >
2023-07-25 18:32:39 +02:00
3b518a3af5
Improve commit graph alignment and truncating ( #26112 ) ( #26127 )
...
Backport #26112 by @wxiaoguang
Fix #26101
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-25 11:43:39 +00:00
08cdc0da3d
Fix wrong workflow status when rerun a job in an already finished workflow ( #26119 ) ( #26124 )
...
Backport #26119 by @yp05327
Before:
After:
After workflow finished, if you rerun a single job, the workflow status
will become to `Running` which is not correct as no jobs are running in
this workflow.
Co-authored-by: yp05327 <576951401@qq.com >
2023-07-25 12:22:58 +02:00
3e07c54be3
Fix escape problems in the branch selector ( #25875 ) ( #26103 )
...
Backport #25875 by @yp05327
Fix #25865
Co-authored-by: yp05327 <576951401@qq.com >
2023-07-25 06:14:18 +00:00
e2596b0a99
Avoid writing config file if not installed ( #26107 ) ( #26113 )
...
Backport #26107 by @wxiaoguang
Just like others (oauth2 secret, internal token, etc), do not generate
if no install lock
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-25 13:31:50 +08:00
a424f6d4f8
Fix handling of Debian files with trailing slash ( #26087 ) ( #26098 )
...
Backport #26087 by @KN4CK3R
Fixes #26022
- Fix handling of files with trailing slash
- Fix handling of duplicate package file errors
- Added test for both
Co-authored-by: KN4CK3R <admin@oldschoolhack.me >
2023-07-24 14:56:13 +00:00
59713541b6
fix Missing 404 swagger response docs for /admin/users/{username} ( #26086 ) ( #26089 )
...
Backport #26086 by @CaiCandong
close #26079
Co-authored-by: caicandong <50507092+CaiCandong@users.noreply.github.com >
2023-07-24 12:07:39 +02:00
Giteabot and GitHub
8d9193680d
Use stderr as fallback if the log file can't be opened ( #26074 ) ( #26083 )
...
Backport #26074 by @wxiaoguang
If the log file can't be opened, what should it do? panic/exit? ignore
logs? fallback to stderr?
It seems that "fallback to stderr" is slightly better than others ....
2023-07-24 05:58:16 +00:00
ab4fd9aa1f
Fix duplicated url prefix on issue context menu ( #26066 ) ( #26067 )
...
Backport #26066 by @lunny
Fix #26060
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com >
2023-07-23 10:27:34 +00:00
221b90d289
Add changelog for 1.20.1 ( #26015 ) ( #26056 )
...
Backport #26015 by @delvh
Co-authored-by: delvh <dev.lh@web.de >
2023-07-22 11:18:59 +02:00
81f5a87eb4
Fix version in rpm repodata/primary.xml.gz ( #26009 ) ( #26048 )
...
Co-authored-by: Peter Verraedt <peter.verraedt@gmail.com >
2023-07-21 20:06:51 +00:00
8b002b429d
Adding remaining enum for migration repo model type. ( #26021 ) ( #26034 )
...
Backport #26021 by @puni9869
Fixes: https://github.com/go-gitea/gitea/issues/26010
Adding remaining enum for migration repo model type.
Co-authored-by: puni9869 <80308335+puni9869@users.noreply.github.com >
2023-07-21 08:54:43 +02:00
dfd371a363
RPM Registry: Show zypper commands for SUSE based distros as well ( #25981 ) ( #26020 )
...
Backport #25981 by @asdil12
After RPM is supported with https://github.com/go-gitea/gitea/pull/23380
let's show the user
how to add the repo and install the RPM via all common package managers.
Co-authored-by: Dominik Heidler <dominik@heidler.eu >
2023-07-20 21:15:47 -04:00
54a516e9da
Fix the route for pull-request's authors ( #26016 ) ( #26018 )
...
Backport #26016 by @wxiaoguang
Close #25906
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 >
2023-07-20 13:38:12 +00:00
Giteabot and GitHub
ac129d4b4c
Correctly refer to dev tags as nightly in the docker docs ( #26004 ) ( #26019 )
...
Backport #26004 by @jolheiser
As title, `dev` tags are no longer used since we switched to `nightly`
Signed-off-by: jolheiser <john.olheiser@gmail.com >
2023-07-20 21:03:40 +08:00
4d5e3b9372
Fix env config parsing for "GITEA____APP_NAME" ( #26001 ) ( #26013 )
...
Backport #26001 by @wxiaoguang
Regression of #24832
Fix the bug and add a test for it
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-20 11:56:36 +02:00
1ba0baa030
Fix commit status color on dashboard repolist ( #25993 ) ( #25998 )
...
Backport #25993 by @silverwind
Followup to https://github.com/go-gitea/gitea/pull/25935 which has
missed to change the icon on the repolist because the logic is not
shared with templates.
Co-authored-by: silverwind <me@silverwind.io >
2023-07-19 23:24:04 +00:00
28e8c691a6
avoid hard-coding height in language dropdown menu ( #25986 ) ( #25997 )
...
Backport #25986 by @earl-warren
This commit removes the hard-coded height of 500px, using that as a
max-height instead. The height of items in the dropdown menu, assuming a
default font size of 16px, is 36px, so the old CSS would cause overly
large dropdown menus in instances where less than 14 languages are
offered.
Refs: https://codeberg.org/forgejo/forgejo/pulls/1000
Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com >
Co-authored-by: rome-user <rome-user@noreply.codeberg.org >
2023-07-20 01:05:22 +02:00
f81a612eb1
parseScope with owner/repo always sets owner to zero ( #25987 ) ( #25989 )
...
Backport #25987 by @earl-warren
Refs: https://codeberg.org/forgejo/forgejo/pulls/1001
Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com >
2023-07-19 22:57:17 +08:00
ee47face12
Update path related documents ( #25417 ) ( #25982 )
...
Backport #25417 by @wxiaoguang
Update WorkPath/WORK_PATH related documents, remove out-dated
information.
Remove "StaticRootPath" on the admin config display page, because few
end user really need it, it only causes misconfiguration.
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-19 09:48:54 +00:00
864bdd0ac8
Make pending commit status yellow again ( #25935 ) ( #25968 )
...
Backport #25935 by @silverwind
With the introduction of Actions, the pending commit icon has changed
from yellow to grey for Drone integrations which never set the "running"
status, so it stays in "pending" until completion.
I find it better to have this icon colored like on 1.19. Now both the
"pending" and "running" icons look the same, but I guess we could add an
animation to the "running" state similar to GitHub has to it later.
Before:
<img width="339" alt="Screenshot 2023-07-17 at 19 14 19"
src="https://github.com/go-gitea/gitea/assets/115237/2f4886e4-74fd-42ea-b59e-9af8f141bf1f ">
After:
<img width="335" alt="Screenshot 2023-07-17 at 19 14 30"
src="https://github.com/go-gitea/gitea/assets/115237/53189642-e72d-47f6-9cbe-f14eda28f730 ">
Also, it matches GH's icon:
<img width="466" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/5804ff90-d223-4a3c-8093-7a9abbaacf87 ">
Co-authored-by: silverwind <me@silverwind.io >
Co-authored-by: delvh <dev.lh@web.de >
2023-07-19 06:43:41 +00:00
037a3f0d8c
Show the mismatched ROOT_URL warning on the sign-in page if OAuth2 is enabled ( #25947 ) ( #25972 )
...
Backport #25947 by @wolfogre
Since OAuth2 will callback the root URL, if the user starts signing in
from a wrong host, Gitea will return 500 because it cannot find the
session.
<details>
<summary>How to reproduce</summary>
<img width="901" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/2c2e255c-e13e-4a11-9be7-b226bee54920 ">
<img width="1014" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/b31cfcf6-a320-483d-9ce5-ba8562f065e1 ">
</details>
So show the mismatched ROOT_URL warning on the sign-in page if OAuth2 is
enabled.
<img width="1015" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/99e80b17-c790-49a3-bbf2-2bd9396a7daa ">
Co-authored-by: Jason Song <i@wolfogre.com >
2023-07-19 04:35:16 +00:00
227c3b67e0
Fix SSPI auth panic ( #25955 ) ( #25969 )
...
Backport #25955 by @wxiaoguang
Try to fix #25952
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-18 22:28:06 +00:00
b7d054e4b5
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 >
2023-07-18 06:40:28 +00:00
Giteabot and GitHub
d032500687
Make environment-to-ini work with INSTALL_LOCK=true ( #25926 ) ( #25937 )
...
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
fix #25924
2023-07-17 18:28:54 +00:00
9159964ada
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:
You can confirm this in:
https://try.gitea.io/yp05327/testrepo/pulls/5
Co-authored-by: yp05327 <576951401@qq.com >
2023-07-17 12:14:22 +00:00
9369b38315
Skip unuseful error message in dev mode when watching local filesystem ( #25919 ) ( #25927 )
...
Backport #25919 by @wxiaoguang
Before, in dev mode, there might be some error logs like:
```
2023/07/17 13:54:51 ...s/assetfs/layered.go:221:WatchLocalChanges() [E] Unable to watch directory .: lstat /data/work/gitea/custom/templates: no such file or directory
```
Because there is no "custom/templates" directory.
After: ignore such error, no such error message anymore.
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-17 10:26:29 +00:00
6e82d0bb7c
Add shutting down notice ( #25920 ) ( #25922 )
...
Backport #25920 by @KN4CK3R
Got the same problem as #25915 when updating an instance. The
`log.Fatal` should have been marked as breaking in #23911 .
This PR adds a notice that the system is shutting down because of the
deprecated setting.
Co-authored-by: KN4CK3R <admin@oldschoolhack.me >
2023-07-17 09:44:10 +00:00
36b9a86bd8
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.
Co-authored-by: yp05327 <576951401@qq.com >
2023-07-17 11:12:59 +02:00
de8127e78b
fix incorrect repo url when changed the case of ownername ( #25733 ) ( #25881 )
...
Backport #25733 by @hiifong
When only the casing of the username changes, update the owner name of the repo,
and keep the original logic consistent with other conditions.
example: assume your username is `gitea`, lowercase username is `gitea` too,
repo URL is `.../gitea/{repo}`.
You change your username to `Gitea`, `GiTea` or something like that,
as long as the lowercase username is still `gitea`, the repo URL remained `.../gitea/{repo}`.
this pr keeps the new username consistent with the repo URL.
Before:
After:
Co-authored-by: hiifong <i@hiif.ong >
2023-07-15 19:47:24 +02:00
186f07bbf7
Make add line comment buttons focusable ( #25894 ) ( #25896 )
...
Backport #25894 by @sebastian-sauer
Use a real button and add an aria-label.
Additionally, show the button whenever it is focused.
See https://codeberg.org/forgejo/forgejo/issues/998 for explanation.
Our handling of this button is now equal to that of GitHub.
Nothing has changed visually.
Co-authored-by: sebastian-sauer <sauer.sebastian@gmail.com >
2023-07-15 12:18:49 +02:00
45b1f4dd3b
Add support for different Maven POM encoding ( #25873 ) ( #25890 )
...
Backport #25873 by @KN4CK3R
Fixes #25853
- Maven POM files aren't always UTF-8 encoded.
- Reject the upload of unparsable POM files
Co-authored-by: KN4CK3R <admin@oldschoolhack.me >
2023-07-14 10:27:15 +00:00
026e745b9e
Fix incorrect release count ( #25879 ) ( #25887 )
...
Backport #25879 by @yp05327
Release count is not correct:
https://try.gitea.io/yp05327/testrepo/tags
https://try.gitea.io/yp05327/testrepo/releases
https://try.gitea.io/yp05327/testrepo/releases/tag/testtag
We already have correct release count, no need to calculate it again.
https://github.com/go-gitea/gitea/blob/c5e187c389b35b9e080a3187b93a775a3c81e585/modules/context/repo.go#L547
Co-authored-by: yp05327 <576951401@qq.com >
2023-07-14 09:32:43 +00:00
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:
After:
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
353dcc5ad4
Fix the error message when the token is incorrect ( #25701 ) ( #25836 )
...
Backport #25701 by @CaiCandong
we refactored `userIDFromToken` for the token parsing part into a new
function `parseToken`. `parseToken` returns the string `token` from
request, and a boolean `ok` representing whether the token exists or
not. So we can distinguish between token non-existence and token
inconsistency in the `verfity` function, thus solving the problem of no
proper error message when the token is inconsistent.
close #24439
related #22119
Co-authored-by: caicandong <50507092+CaiCandong@users.noreply.github.com >
Co-authored-by: Jason Song <i@wolfogre.com >
2023-07-12 10:18:27 +00:00
abe9c641ce
Show correct SSL Mode on "install page" ( #25818 ) ( #25838 )
...
Backport #25818 by @wxiaoguang
Fix #25817
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-12 02:01:38 -04:00
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
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
a1bc2aa05e
Avoid amending the Rebase and Fast-forward merge if there is no message template ( #25779 ) ( #25809 )
...
Backport #25779 by @wxiaoguang
Related #22669 . Close #25177
After the fix:
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-10 10:23:54 +00:00
d713cf6150
Fix WORK_DIR for docker (root) image ( #25738 ) ( #25811 )
...
Backport #25738 by @wxiaoguang
Fix #25726
#17846 chose an incorrect WORK_DIR path for docker root image.
Gitea's work-path was already used as the base path for various paths
(like AppDataPath), so, the work-path should be mounted to a volume in a
docker image.
Now, for docker root image, it's unavoidable to mix the
WorkPath/CustomPath/AppDataPath in the same directory ("/data/gitea"),
because some of them have already been mixed.
Some directories in the screenshot are for "CustomPath" , while others
are for "AppDataPath", due to the technical debts in old code:
```
CUSTOM_PATH="/data/gitea"
APP_DATA_PATH = /data/gitea
```
<details>
</details>
This PR is breaking but this is the only way at the moment to avoid
users losing their data accidently
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-10 10:54:16 +02:00
372b622c2b
Revert package access change from #23879 ( #25707 ) ( #25785 )
...
Backport #25707 by @KN4CK3R
Fixes (?) #25538
Fixes https://codeberg.org/forgejo/forgejo/issues/972
Regression #23879
#23879 introduced a change which prevents read access to packages if a
user is not a member of an organization.
That PR also contained a change which disallows package access if the
team unit is configured with "no access" for packages. I don't think
this change makes sense (at the moment). It may be relevant for private
orgs. But for public or limited orgs that's useless because an
unauthorized user would have more access rights than the team member.
This PR restores the old behaviour "If a user has read access for an
owner, they can read packages".
Co-authored-by: KN4CK3R <admin@oldschoolhack.me >
2023-07-09 21:00:42 +00:00
06bcdfe77a
Remove unused code ( #25734 ) ( #25788 )
...
Backport #25734 by @KN4CK3R
The method is only used in the test. Found it because I changed the
fixtures and had a hard time fixing this test. My revenge is deleting
it.
Co-authored-by: KN4CK3R <admin@oldschoolhack.me >
2023-07-09 19:47:58 +00:00
a5a3c81412
Fix notification list bugs ( #25781 ) ( #25787 )
...
Backport #25781 by @wxiaoguang
Fix #25627
1. `ctx.Data["Link"]` should use relative URL but not AppURL
2. The `data-params` is incorrect because it doesn't contain "page". JS
can simply use "window.location.search" to construct the AJAX URL
3. The `data-xxx` and `id` in notification_subscriptions.tmpl were
copied&pasted, they don't have affect.
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-09 19:15:00 +00:00
ea2c9de3c4
Test if container blob is accessible before mounting ( #22759 ) ( #25784 )
...
Backport #22759 by @KN4CK3R
related #16865
This PR adds an accessibility check before mounting container blobs.
Co-authored-by: KN4CK3R <admin@oldschoolhack.me >
Co-authored-by: techknowlogick <techknowlogick@gitea.io >
Co-authored-by: silverwind <me@silverwind.io >
2023-07-09 12:00:04 +00:00
68a3961bf1
docs: rootless docker ssh's default port is 2222 ( #25771 ) ( #25772 )
...
Backport #25771 by @leavesster
---
according `docker/rootless/usr/local/bin/docker-setup.sh` , in rootless
docker setup, ssh port is 2222.
and mysql database case should port same as PostgreSQL port
Co-authored-by: leavesster <11785335+leavesster@users.noreply.github.com >
2023-07-09 15:45:42 +08:00
91dadedddf
Translate untranslated string in issues list ( #25759 ) ( #25761 )
...
Backport #25759 by @Maks1mS
Co-authored-by: Maxim Slipenko <no-reply@maxim.slipenko.com >
2023-07-07 23:04:08 +00:00
32eaba1b40
Hide add file button for pull mirrors ( #25748 ) ( #25751 )
...
Backport #25748 by @hiifong
I think hiding the add file button for mirror repositories that can keep
the ui clean.
Before:
After:
Co-authored-by: hiifong <i@hiif.ong >
2023-07-07 14:12:59 +00:00
e595dfeec7
Allow/fix review (approve/reject) of empty PRs ( #25690 ) ( #25732 )
...
Backport #25690 by @sebastian-sauer
gitea allows to create empty PRs.
Currently when you need approvals for a merge, you have to manually add
/files to the url to get to the files tab to approve / reject the PR.
This PR allows to open the files tab via the normal tab / link and then
fixes the layout of the files tab.
**Screenshots:**
Before:
After:
Co-authored-by: sebastian-sauer <sauer.sebastian@gmail.com >
Co-authored-by: silverwind <me@silverwind.io >
2023-07-06 19:34:41 +00:00
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
68e0c802f7
Show correct naming for 1 comment ( #25704 ) ( #25712 )
...
Backport #25704 by @earl-warren
- Resolves https://codeberg.org/forgejo/forgejo/issues/948
Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com >
Co-authored-by: Gusted <postmaster@gusted.xyz >
2023-07-06 16:04:13 +00:00
09668b2e2e
Correct permissions for .ssh and authorized_keys ( #25721 ) ( #25730 )
...
Backport #25721 by @wolfogre
Set the correct permissions on the .ssh directory and authorized_keys
file, or sshd will refuse to use them and lead to clone/push/pull
failures.
It could happen when users have copied their data to a new volume and
changed the file permission by accident, and it would be very hard to
troubleshoot unless users know how to check the logs of sshd which is
started by s6.
Co-authored-by: Jason Song <i@wolfogre.com >
2023-07-06 11:02:56 -04:00
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
511be9fe6e
Fix position of org follow button ( #25688 ) ( #25692 )
...
Backport #25688 by @silverwind
This has recently regressed it seems. Put it back into same position as
https://github.com/go-gitea/gitea/pull/24345 .
Before:
<img width="1246" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/bb410c29-5539-4dad-8351-8da8470f7091 ">
After:
<img width="1236" alt="Screenshot 2023-07-04 at 21 19 13"
src="https://github.com/go-gitea/gitea/assets/115237/072e0e83-defd-484d-8861-33d73fa0e446 ">
Co-authored-by: silverwind <me@silverwind.io >
2023-07-05 08:31:12 +02:00
4e310133f9
Prevent duplicate image loading ( #25675 ) ( #25684 )
...
Backport #25675 by @delvh
Regression of #25672 .
Co-authored-by: delvh <dev.lh@web.de >
2023-07-04 14:49:39 +00:00
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
1f90376041
Fix show more for image on diff page ( #25672 ) ( #25673 )
...
Backport #25672 by @HesterG
Right now when clicking on loadmore on files change page, if the loaded
content is image, it will be always in load status:
https://github.com/go-gitea/gitea/assets/17645053/39e449b6-067a-474c-9443-9dd98d5bbfe2
This PR fixes this by adding `initImageDiff ` to `onShowMoreFiles `
After:
https://github.com/go-gitea/gitea/assets/17645053/87bbb13e-0064-4a6e-a7ad-0f0060eb8bff
Co-authored-by: HesterG <hestergong@gmail.com >
2023-07-04 04:44:45 -04:00
0af6542a34
Add unit test for repository collaboration ( #25640 ) ( #25658 )
...
Backport #25640 by @earl-warren
- Add a few extra test cases and test functions for the collaboration
model to get everything covered by tests (except for error handling, as
we cannot suddenly mock errors from the database).
```
-> % go tool cover -func=coverage.out | grep "code.gitea.io/gitea/models/repo/collaboration.go"
```
Before:
```
code.gitea.io/gitea/models/repo/collaboration.go:28: init 100.0%
code.gitea.io/gitea/models/repo/collaboration.go:39: GetCollaborators 61.5%
code.gitea.io/gitea/models/repo/collaboration.go:65: CountCollaborators 0.0%
code.gitea.io/gitea/models/repo/collaboration.go:70: GetCollaboration 0.0%
code.gitea.io/gitea/models/repo/collaboration.go:83: IsCollaborator 100.0%
code.gitea.io/gitea/models/repo/collaboration.go:87: getCollaborations 42.9%
code.gitea.io/gitea/models/repo/collaboration.go:102: ChangeCollaborationAccessMode 77.8%
code.gitea.io/gitea/models/repo/collaboration.go:141: IsOwnerMemberCollaborator 0.0%
```
After:
```
code.gitea.io/gitea/models/repo/collaboration.go:28: init 100.0%
code.gitea.io/gitea/models/repo/collaboration.go:39: GetCollaborators 61.5%
code.gitea.io/gitea/models/repo/collaboration.go:65: CountCollaborators 100.0%
code.gitea.io/gitea/models/repo/collaboration.go:70: GetCollaboration 100.0%
code.gitea.io/gitea/models/repo/collaboration.go:83: IsCollaborator 100.0%
code.gitea.io/gitea/models/repo/collaboration.go:87: getCollaborations 100.0%
code.gitea.io/gitea/models/repo/collaboration.go:102: ChangeCollaborationAccessMode 83.3%
code.gitea.io/gitea/models/repo/collaboration.go:141: IsOwnerMemberCollaborator 87.5%
```
Co-authored-by: Gusted <postmaster@gusted.xyz >
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/825
Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com >
Co-authored-by: Gusted <postmaster@gusted.xyz >
Co-authored-by: Gusted <gusted@noreply.codeberg.org >
Co-authored-by: silverwind <me@silverwind.io >
2023-07-04 06:29:43 +00:00
69bdcf41f3
Log the real reason when authentication fails (but don't show the user) ( #25414 ) ( #25660 )
...
Backport #25414 by @lunny
Fix #24498
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com >
2023-07-03 19:26:36 -04:00
e610b0389a
Fix UI misalignment on user setting page ( #25629 ) ( #25656 )
...
Backport #25629 by @wxiaoguang
Fix #25628
Diff with ignoring space:
https://github.com/go-gitea/gitea/pull/25629/files?diff=unified&w=1
The "modal" shouldn't appear between "ui attached segment", otherwise
these segments lose margin-top.
After the fix:
<details>
</details>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-07-03 21:16:58 +00:00
64ed262e18
Fix bug when change user name ( #25637 ) ( #25646 )
...
Backport #25637 by @lunny
Fix #25621
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com >
2023-07-03 14:23:35 +03:00
d8a59d5f12
use css on labels ( #25626 ) ( #25636 )
...
Backport #25626 by @derelm
Changes html to use CSS label class similar to
`templates/shared/actions/runner_list.tmpl`
Before:
After:
List view (for reference - unchanged):
Co-authored-by: derelm <465155+derelm@users.noreply.github.com >
2023-07-03 12:25:16 +08:00
1ddfe03131
Use AfterCommitId to get commit for Viewed functionality ( #25529 ) ( #25612 )
...
Backport #25529 by @sebastian-sauer
the PullHeadCommitID is not always available when the PR is merged.
Not sure if this is the best solution but in my simple tests it looks
like this fixes the problem - happy to get any feedback.
hopefully fixes https://github.com/go-gitea/gitea/issues/24813
Co-authored-by: sebastian-sauer <sauer.sebastian@gmail.com >
2023-07-01 07:56:56 +08:00
24cf06592e
Restrict [actions].DEFAULT_ACTIONS_URL to only github or self ( #25581 ) ( #25604 )
...
Backport #25581 by @wolfogre
Resolve #24789
## ⚠️ BREAKING ⚠️
Before this, `DEFAULT_ACTIONS_URL` cound be set to any custom URLs like
`https://gitea.com ` or `http://your-git-server,https://gitea.com `, and
the default value was `https://gitea.com `.
But now, `DEFAULT_ACTIONS_URL` supports only
`github`(`https://github.com `) or `self`(the root url of current Gitea
instance), and the default value is `github`.
If it has configured with a URL, an error log will be displayed and it
will fallback to `github`.
Actually, what we really want to do is always make it
`https://github.com `, however, this may not be acceptable for some
instances of internal use, so there's extra support for `self`, but no
more, even `https://gitea.com `.
Please note that `uses: https://xxx/yyy/zzz ` always works and it does
exactly what it is supposed to do.
Although it's breaking, I belive it should be backported to `v1.20` due
to some security issues.
Follow-up on the runner side:
- https://gitea.com/gitea/act_runner/pulls/262
- https://gitea.com/gitea/act/pulls/70
Co-authored-by: Jason Song <i@wolfogre.com >
2023-06-30 07:53:00 +00:00
0b6f7fb607
read-only checkboxes don't appear and don't entirely act the way one might expect ( #25573 ) ( #25602 )
...
Backport #25573 by @saegl5
This pull request fades read-only checkboxes and checkmark, and it makes
the checkboxes act more read-only/disabled by not changing the
border-color when clicked.
Examples using light mode:
| Before | After |
| - | - |
| 
| 
|
| 
| 
|
| | read-only checkboxes and checkmark are faded<br>and the checkboxes
act more read-only/disabled |
Fixes/Closes/Resolves #25076
Co-authored-by: Ed Silkworth <ed.silkworth@icloud.com >
Co-authored-by: silverwind <me@silverwind.io >
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-06-29 22:53:43 +00:00
12aca3ef20
Add documentation about supported workflow trigger events ( #25582 ) ( #25589 )
...
Backport #25582 by @Zettat123
Right now Gitea doesn't support all [Events that trigger
workflows](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows ).
This PR lists the supported events to help users write workflow files.
Co-authored-by: Zettat123 <zettat123@gmail.com >
2023-06-29 14:51:46 +02:00
2390a46d0f
Reduce table padding globally ( #25568 ) ( #25577 )
...
Backport #25568 by @silverwind
Fomantic's tables have too much padding. Reduce it so we have more
information density in them. Especially the admin tables need this
because they are bursting already because of column count.
## Admin repolist before and after
<img width="909" alt="Screenshot 2023-06-28 at 20 27 55"
src="https://github.com/go-gitea/gitea/assets/115237/954c925c-8db5-47ce-ae51-a2168b857014 ">
<img width="897" alt="Screenshot 2023-06-28 at 20 36 03"
src="https://github.com/go-gitea/gitea/assets/115237/0bddc09a-9117-48b3-a17e-3d34c58d8d3d ">
## Other tables
<img width="1230" alt="Screenshot 2023-06-28 at 20 36 22"
src="https://github.com/go-gitea/gitea/assets/115237/38f555b6-a7ce-416a-9f1f-706eaf18863b ">
<img width="1236" alt="Screenshot 2023-06-28 at 20 26 37"
src="https://github.com/go-gitea/gitea/assets/115237/82b2878e-358c-4dc2-a6b4-c66e43cd2dfb ">
<img width="1231" alt="Screenshot 2023-06-28 at 20 59 30"
src="https://github.com/go-gitea/gitea/assets/115237/c6a92e55-a3a3-4c80-9a0d-50aebb49886c ">
Files table is unaffected because it has custom padding already.
Co-authored-by: silverwind <me@silverwind.io >
2023-06-29 09:24:02 +00:00
51b6a78791
Fix milestones deletion ( #25583 ) ( #25584 )
...
Backport #25583 by @HesterG
Close #25557
Fix regression from #25315
`data-id` is still needed for deleting milestone.
Co-authored-by: HesterG <hestergong@gmail.com >
2023-06-29 08:52:05 +00:00
8981f6d0fc
Fix content holes in Actions task logs file ( #25560 ) ( #25566 )
...
Backport #25560 by @wolfogre
Fix #25451 .
Bugfixes:
- When stopping the zombie or endless tasks, set `LogInStorage` to true
after transferring the file to storage. It was missing, it could write
to a nonexistent file in DBFS because `LogInStorage` was false.
- Always update `ActionTask.Updated` when there's a new state reported
by the runner, even if there's no change. This is to avoid the task
being judged as a zombie task.
Enhancement:
- Support `Stat()` for DBFS file.
- `WriteLogs` refuses to write if it could result in content holes.
Co-authored-by: Jason Song <i@wolfogre.com >
2023-06-28 23:39:23 +00:00
b2b5c80cb2
Use correct response code in push mirror creation response in v1_json.tmpl ( #25476 ) ( #25571 )
...
Backport #25476 by @GeorgDangl
In the process of doing a bit of automation via the API, we've
discovered a _small_ issue in the Swagger definition. We tried to create
a push mirror for a repository, but our generated client raised an
exception due to an unexpected status code.
When looking at this function:
https://github.com/go-gitea/gitea/blob/3c7f5ed7b5bff347198cbb26492e6354ea42733b/routers/api/v1/repo/mirror.go#L236-L240
We see it defines `201 - Created` as response:
https://github.com/go-gitea/gitea/blob/3c7f5ed7b5bff347198cbb26492e6354ea42733b/routers/api/v1/repo/mirror.go#L260-L262
But it actually returns `200 - OK`:
https://github.com/go-gitea/gitea/blob/3c7f5ed7b5bff347198cbb26492e6354ea42733b/routers/api/v1/repo/mirror.go#L373
So I've just updated the Swagger definitions to match the code😀
Co-authored-by: Georg Dangl <10274404+GeorgDangl@users.noreply.github.com >
2023-06-28 19:00:56 -04:00
77db40e084
Fix bugs related to notification endpoints ( #25548 ) ( #25562 )
...
Backport #25548 by @Zettat123
This PR
- fixes #25545
- fixes two incorrect `reqToken()` in `/notifications` endpoints (caused
by #24767 )
Co-authored-by: Zettat123 <zettat123@gmail.com >
2023-06-28 16:24:48 +00:00
7222bac4e3
Align language menu icon and fit the footer area ( #25556 ) ( #25563 )
...
Backport #25556 by @wxiaoguang
Close #25551
## Before
## After
----
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-06-28 11:51:24 -04:00
102dcfa3a0
Change Regenerate Secret button display ( #25534 ) ( #25541 )
...
Backport #25534 by @KN4CK3R
Fixes #25527
Preview:
Co-authored-by: KN4CK3R <admin@oldschoolhack.me >
2023-06-27 20:14:58 +00:00
614d6df2d8
Fix admin-dl-horizontal ( #25512 ) ( #25535 )
...
Backport #25512 by @wxiaoguang
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
Co-authored-by: HesterG <hestergong@gmail.com >
Co-authored-by: silverwind <me@silverwind.io >
2023-06-27 17:06:36 +00:00
345a25d016
Fix rerun icon on action view component ( #25531 ) ( #25536 )
...
Backport #25531 by @HesterG
Right now rerun icon on action view component will not be seen when
duration text length is long, because the wrapper `job-brief-info` has a
fixed width, and the svg is squeezed. The way to fix this in this PR is
to change width to `fit-content` and exchange position of duration text
and rerun svg.
Before (rerun svg not shown on hover):
<img width="1401" alt="Screen Shot 2023-06-27 at 12 53 41"
src="https://github.com/go-gitea/gitea/assets/17645053/bb3f62ec-8c56-4dbc-96f1-718b50426d91 ">
After:
<img width="1409" alt="Screen Shot 2023-06-27 at 12 50 59"
src="https://github.com/go-gitea/gitea/assets/17645053/620aa02c-2326-408d-a763-453f48f42c40 ">
Co-authored-by: HesterG <hestergong@gmail.com >
2023-06-27 12:28:14 -04:00
e8a7cd4a1d
Fix input line-height cutting off g ( #25334 ) ( #25533 )
...
Backport #25334 by @hiifong
Fix the incomplete display of input text
Before:
After:
Co-authored-by: hiifong <i@hiif.ong >
Co-authored-by: silverwind <me@silverwind.io >
2023-06-27 11:31:18 +02:00
9d69a4758e
Add Adopt repository event and handler ( #25497 ) ( #25518 )
...
Backport #25497 by @lunny
Fix #14304
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com >
Co-authored-by: delvh <dev.lh@web.de >
Co-authored-by: KN4CK3R <admin@oldschoolhack.me >
2023-06-26 20:09:07 +00:00
53747a58a0
Clarify the reason why the user can't add a new email if there is a pending activation ( #25509 ) ( #25514 )
...
Backport #25509 by @wxiaoguang
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-06-26 17:28:48 +08:00
00ba826360
Fix CLI sub-command handling ( #25501 ) ( #25517 )
...
Backport #25501 by @wxiaoguang
A regression of #25330 : The nil "Action" should be treated as "help"
In old releases: `./gitea admin` show helps
After #25330 : `./gitea admin` panics (although the code returned `nil`
if action is nil, but Golang's quirk is: nil in interface is not nil)
With this PR: `./gitea admin` shows helps as the old releases.
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-06-26 16:41:52 +08:00
Giteabot and GitHub
9bbb4d8d6d
Improve loadprojects for issue list ( #25468 ) ( #25493 )
2023-06-26 02:06:58 +00:00
85bad22ff8
Fine tune "dropdown button" icon ( #25442 ) ( #25499 )
...
Backport #25442 by @wxiaoguang
----
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-06-25 14:35:26 +08:00
71d2a6a41a
Use InitWorkPathAndCfgProvider for environment-to-ini to avoid unnecessary checks ( #25480 ) ( #25488 )
...
Backport #25480 by @wxiaoguang
Fix #25481
The `InitWorkPathAndCommonConfig` calls `LoadCommonSettings` which does
many checks like "current user is root or not".
Some commands like "environment-to-ini" shouldn't do such check, because
it might be run with "root" user at the moment (eg: the docker's setup
script)
ps: in the future, the docker's setup script should be improved to avoid
Gitea's command running with "root"
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-06-24 14:04:50 +00:00
Giteabot and GitHub
2cd9d6b3f9
Fix wrong warn messages in migration steps ( #25475 ) ( #25487 )
2023-06-24 17:51:26 +08:00
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
### for mobile
### other changed pages
<details>
</details>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-06-24 10:16:15 +08:00
b0de3d08b8
Fix repo search broken because of profile page added ( #25455 ) ( #25467 )
...
Backport #25455 by @lunny
Fix #25433
Caused by #23260
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com >
2023-06-23 15:48:35 +02:00
2e64449de7
Make "dismiss" content shown correctly ( #25461 ) ( #25465 )
...
Backport #25461 by @wxiaoguang
Close #25127
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com >
2023-06-23 11:04:15 +00:00
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
