forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fork updates from go-gitea/gitea main #63
Open
github-actions
wants to merge
4,640
commits into
kitspace:main
Choose a base branch
from
go-gitea:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix: #32731 --------- Co-authored-by: wxiaoguang <[email protected]>
Only upgrading the ssh package is not enough.
This feature is experimental, not fully tested, and may be changed in the future. It is only designed for users who really need it: set `[repository].ALLOW_FORK_INTO_SAME_OWNER=true` in your app.ini Doc: https://gitea.com/gitea/docs/pulls/122 ![image](https://github.com/user-attachments/assets/38d08c23-9cfc-49d8-9321-ff81edf65395)
Fix #32795 If a job uses a matrix, multiple `ActionRunJobs` may have the same `JobID`. We need to merge the outputs of these jobs to make them available to the jobs that need them.
Release notes: https://github.com/bigskysoftware/htmx/releases/tag/v2.0.4 Tested `Star`, `Watch`, and the admin dashboard page. All functionality remains unchanged. Signed-off-by: Yarden Shoham <[email protected]>
Two tweaks to Monaco to improve JSX/TSX support. 1. Certain language features like JSX/TSX only work when passing `uri` (containing the filename), do this. 2. Set the `jsx` compiler option to avoid error annotations Before: <img width="441" alt="Screenshot 2024-12-13 at 15 11 33" src="https://github.com/user-attachments/assets/dac245a7-e80f-4249-8e09-13124b03d12a" /> After: <img width="441" alt="Screenshot 2024-12-13 at 15 10 46" src="https://github.com/user-attachments/assets/726ad712-d116-438d-88da-bc40534b6860" />
Add more tests
…32838) Fix: #32611 In some lfs server implementations, they require the ref attribute. --------- Co-authored-by: wxiaoguang <[email protected]>
Update it and fix new issues related to `redefines-builtin-id`
Add more comments to explain the ssh problem, and rename `sshConn` to `sshSession`
…ld not be translated (#32850) The input content should always be `1h 2m 3s` and will be the same on different UI languages. So the translation is wrong.
Before and after: <img width="218" alt="Screenshot 2024-12-15 at 04 53 53" src="https://github.com/user-attachments/assets/299b1f0a-ba72-47c6-b662-a9d540d4d741" /> <img width="222" alt="Screenshot 2024-12-15 at 04 53 41" src="https://github.com/user-attachments/assets/5a2b5332-e324-4d20-82e9-21d1c850e826" /> Diff without whitespace: https://github.com/go-gitea/gitea/pull/32847/files?diff=unified&w=1 The `tw-mt-2` is fine even if the element renders empty: <img width="387" alt="image" src="https://github.com/user-attachments/assets/76a976e4-ba2e-48a5-9248-c361552a937a" /> --------- Co-authored-by: wxiaoguang <[email protected]>
Enables tenv and testifylint linters closes: #32842
1. restore background color 2. fix border radius on top/bottom and on hover 3. parent link is now full-row again, much easier to click 4. parent link now uses directory icon, matching github 5 changed grid layout to remove auto width on file name column which could get too small. 6. mobile layout now shows more of the filename. --------- Co-authored-by: wxiaoguang <[email protected]>
Fixes 79 typescript errors. Discovered at least two bugs in `notifications.ts`, and I'm pretty sure this feature was at least partially broken and may still be, I don't really know how to test it. After this, only like ~10 typescript errors remain in the codebase but those are harder to solve. --------- Co-authored-by: wxiaoguang <[email protected]>
Fix #32761 (comment) --------- Co-authored-by: wxiaoguang <[email protected]>
## Why join I didn’t talk about myself before, so some people may think that I am an employee from the company. So I think it is necessary to talk about why and how I joined. At the begining, my boss gave me a task to find a git software which can self hosted in on-premise. Then I found that there are not many project which meet our needs. But finally, I found Gitea. A easy use, easy maintenance, and without a good machine you can also run it. At that time, I just finished my previous work which is using helm to deploy something in K8s. So I tried to use Gitea’s helm chart to deploy in my work PC to see whether we can use it. But soon, I found a bug, and reported it (https://gitea.com/gitea/helm-chart/issues/382), but after about 1 month, there’s no fix. So I try to check the source code, and I found that it is caused by Gitea’s code and it is easy to fix it. So I created an issue (#22523) in Gitea. But unfortunately, after a long time again, it is still not fixed. So I tried to finish it by myself. I’m not a pro programmer, coding is just my hobby since I was 13 or 14 years old. (I will tell the reason later), I even don’t know the workflow about the contribution of OSS, so maybe I did some bad things at the early time, I apologize. But the people here are very kind, at that time, I start to consider whether it has worth to recommend to my boss. So I started to use it, but I found more and more bugs in a short time. Japanese company is very sensitive to it, so I gave up to recommend. But I can try to fix them! Because I can learn too many things during the contribution, not just about the programing but also the usage of other tools and the general contribution rule in the world of OSS. It let me grow up, and to become (maybe) a perfect full-stack engineer which is my dream. (Why it is my dream? I made a wrong decision in my college, I took/followed the advice of my parent, choosed communications engineering instead of computer science which is my favorite thing) # Why leave Several days ago, there’s an [article](https://juejin.cn/post/7446578471901626420#comment) came into my eye. Something about JiHu (GitLab Ltd in China) start to file a lawsuit to the company which is using GitLab CE version which is under MIT License. So people start to find other git service/application to avoid it. And in the this article, a project called Fogejo is mentioned. It says it is a hard-fork of Gitea. But I don’t know the meaning of `hard-fork`, so I access the home page of this project to find where it comes from. Finally, I found it here: https://forgejo.org/compare-to-gitea/#why-was-forgejo-created. They said: > As of early 2024, Forgejo is developed independently of Gitea, as a “hard-fork”. `hard-fork` has a quotation, so the meaning is not the original meaning of it, but they said `as`, which means `like` or `similar` I think. So just focus on the words before `as` is ok, because `hard-fork` is a simile, `As of early 2024, Forgejo is developed independently of Gitea` is what they want to say. In my mind, this means: since early 2024 Forgejo’s codes (new changes) are all written by themselves, and emphasize that these changes are not related to Gitea, because they can simply say `As of early 2024, Forgejo is developed independently, as a “hard-fork”` But after I check the commit history, I can still find some strange commits in recent month: https://codeberg.org/forgejo/forgejo/commits/branch/forgejo/search?q=author%3Ayp05327&all= The author is me, but the commit is signed by someone I even never heard. Considering the words they said above, it feels/sounds like my work has become their work. Although Gitea is under MIT license, is this allowed in the OSS world? Even it is allowed, I can not accept it personally. So I created a issue to ask them: https://codeberg.org/forgejo/forgejo/issues/6236 https://codeberg.org/forgejo/discussions/issues/251 Finally, it seems that they understood the problem and promised to improve it. But I also required a public statement to explain it which means they need to apologize, otherwise it is hard to the users who believe these are all their work know it, and it seems they ignored some of my words again? So it is hard for me to believe they will really make changes and post the apologize. If they did, I will consider to come back. Otherwise, I think there’s no worth to continually contribute to any OSS project, so I decided to leave. ps: TOC voting is still ongoing, please remove me from the list. And I will leave the organization after the merge. At the end, thanks to all people who have helped me to finish the contribution and teach me new knowledges.
… full sha256 (#32851) Related: #24973 Before: ![image](https://github.com/user-attachments/assets/bca17900-5075-4d15-af7a-c71bf8979c04) After: ![image](https://github.com/user-attachments/assets/c5a24e3b-763b-4463-80db-d4dbd89f7dc4) Index: ```json { "schemaVersion": 2, "mediaType": "application/vnd.oci.image.index.v1+json", "manifests": [ { "mediaType": "application/vnd.oci.image.manifest.v1+json", "digest": "sha256:5967afffdfde104ca1459286a72346baaef8b70ac153325d7a6cd85c7734ac6e", "size": 672, "platform": { "architecture": "amd64", "os": "linux" } }, { "mediaType": "application/vnd.oci.image.manifest.v1+json", "digest": "sha256:f9abfcc55320f9ff1f38eeb7dbb4bea10b29c7febfa49ccd7aab9fa02403b9f0", "size": 672, "platform": { "architecture": "arm64", "os": "linux" } }, { "mediaType": "application/vnd.oci.image.manifest.v1+json", "digest": "sha256:d70ad19d00c19e40691045cbddc3e8a5a4454c31cc454d1132b13bcaf35b6d46", "size": 566, "annotations": { "vnd.docker.reference.digest": "sha256:5967afffdfde104ca1459286a72346baaef8b70ac153325d7a6cd85c7734ac6e", "vnd.docker.reference.type": "attestation-manifest" }, "platform": { "architecture": "unknown", "os": "unknown" } }, { "mediaType": "application/vnd.oci.image.manifest.v1+json", "digest": "sha256:73bc233bf4eac96a404ce3e0430b698831a4ea7050c878d5f76d1d1f133751dd", "size": 566, "annotations": { "vnd.docker.reference.digest": "sha256:f9abfcc55320f9ff1f38eeb7dbb4bea10b29c7febfa49ccd7aab9fa02403b9f0", "vnd.docker.reference.type": "attestation-manifest" }, "platform": { "architecture": "unknown", "os": "unknown" } } ] } ``` --------- Co-authored-by: silverwind <[email protected]>
Make the result the same as GitHub: * all skipped, then result is skipped * any cancelled, then result cancelled
Estimated time represented in hours it might be convenient to have tracked time represented in the same way to be compared and managed. --------- Co-authored-by: Sysoev, Vladimir <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
…33204) When the parent Commit does not exist on gitea, an error will be reported when opening the Commit details page: invalid memory address or nil pointer dereference. ![image](https://github.com/user-attachments/assets/4c2a9802-935f-41e9-b5b9-a4f0d745f709) ![image](https://github.com/user-attachments/assets/7b0bc15e-7f5f-4d58-8d24-fee667a799fa)
Fix password form missing whilst linking account even with `ENABLE_PASSWORD_SIGNIN_FORM = true`. Remove redundant empty box in account linking sign up page when `LinkAccountMode` is true. --------- Co-authored-by: wxiaoguang <[email protected]>
And add comments & tests
Fix #33271 Suppose there is a `branch-a` in fork repo: 1. if `branch-a` exists in base repo: try to sync `base:branch-a` to `fork:branch-a` 2. if `branch-a` doesn't exist in base repo: try to sync `base:main` to `fork:branch-a`
After the RefName refactoring, the `ctx.Repo.CommitID` is only set when there is a `RepoRefByType` middleware. Many handlers do not use that middleware and they only use "default branch"
And do not handle special keys when the text-expander popup exists
1. Add a OpenTelemetry-like shim-layer to collect traces 2. Add a simple builtin trace collector and exporter, end users could download the diagnosis report to get the traces. This PR's design is quite lightweight, no hard-dependency, and it is easy to improve or remove. We can try it on gitea.com first to see whether it works well, and fine tune the details. --------- Co-authored-by: silverwind <[email protected]>
Fixes: #33344 Co-authored-by: wxiaoguang <[email protected]>
Enable `noImplicitAny` and fix all issues. --------- Co-authored-by: wxiaoguang <[email protected]>
Fixes: https://github.com/go-gitea/gitea/security/dependabot/88 Fixes: https://github.com/go-gitea/gitea/security/dependabot/87 Tested Katex, works as expected.
Fix #33314 --------- Co-authored-by: wxiaoguang <[email protected]>
Extract from #33320 This PR uses a map instead of a struct to store webhook event information. It removes many duplicated functions and makes the logic clearer.
Reduce it to a value that results in `.repo-home-sidebar-top` and `.repo-home-sidebar-bottom` having 240px content width, the same as GitHub. Before: <img width="1333" alt="Screenshot 2025-01-15 at 18 28 34" src="https://github.com/user-attachments/assets/cf0fa21b-87be-40e3-a6cd-26d146bce9cc" /> After: <img width="1330" alt="Screenshot 2025-01-15 at 18 28 27" src="https://github.com/user-attachments/assets/28acd837-10f4-4176-b8a0-510cd28c8b8d" />
1. add `GetSiteCookieFlashMessage` to help to parse flash message 2. clarify `handleRepoHomeFeed` logic 3. remove unnecessary global variables, use `sync.OnceValue` instead 4. add some tests for `IsUsableUsername` and `IsUsableRepoName`
Update all tool dependencies to latest versions.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.