Apply patches v1.22.4 #32884
Closed
Apply patches v1.22.4 #32884
Conversation
This file contains hidden or 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
Backport go-gitea#31023 by wxiaoguang Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
…31028) (go-gitea#31032) Backport go-gitea#31028 by @kemzeb From go-gitea#31018 (comment). This commit removes the link to a deleted branch name because it returns a 404 while it is in this deleted state. GitHub also throws a 404 when navigating to a branch link that was just deleted, but this deleted branch is removed from the branch list after a page refresh. Since with Gitea this deleted branch would be kept around for quite some time (well, until the "cleanup deleted branches" cron job begins), it makes sense to not have this as a link that users can navigate to. Co-authored-by: Kemal Zebari <60799661+kemzeb@users.noreply.github.com>
…#31042) Backport go-gitea#31015 by @denyskon Do not try to create a new authorization grant when one exists already, thus preventing a DB-related authorization issue. Fix go-gitea#30790 (comment) Co-authored-by: Denys Konovalov <kontakt@denyskon.de> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
…ered (go-gitea#30780) (go-gitea#31039) Backport go-gitea#30780 by @lunny Replace go-gitea#25741 Close go-gitea#24445 Close go-gitea#30658 Close go-gitea#20646 ~Depends on go-gitea#30805~ Since go-gitea#25741 has been rewritten totally, to make the contribution easier, I will continue the work in this PR. Thanks @6543 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
go-gitea#31022) (go-gitea#31049) Backport go-gitea#31022 by @kemzeb Syncs up docs associated to actions and deleted branch cleanup i.e. in custom/app.example.ini and the config cheat sheet. Co-authored-by: Kemal Zebari <60799661+kemzeb@users.noreply.github.com>
…ea#31048) Backport go-gitea#31034 by @lunny Fix go-gitea#25897 (comment) Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: yp05327 <576951401@qq.com>
…o-gitea#31043) Backport go-gitea#25812 ~~ps: removed some new codes in `tests/integration/pull_merge_test.go`~~ --------- Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Backport go-gitea#31047 by @techknowlogick Co-authored-by: techknowlogick <techknowlogick@gitea.com>
…n field (go-gitea#31045) (go-gitea#31059) Backport go-gitea#31045 by @Zettat123 Fix go-gitea#31044 According to [GitHub issue template documentation](https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema#attributes-for-dropdown), the `default` attribute can be used to specify the preselected option for a dropdown field. Co-authored-by: Zettat123 <zettat123@gmail.com>
…#31081) Backport go-gitea#28435 by Chief-Detektor Co-authored-by: André Rosenhammer <andre.rosenhammer@gmail.com>
…ea#31098) Backport go-gitea#31092 by @lunny Fix go-gitea#31087 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
…a#31097) Backport go-gitea#31089 by @silverwind Presumably a regression from go-gitea#30325, these menus were showing a border radius on hover, which is fixed with this change. <img width="154" alt="image" src="https://github.com/go-gitea/gitea/assets/115237/eafdc1c5-3cf5-48d1-86c4-21c58f92cfaf"> Co-authored-by: silverwind <me@silverwind.io>
) (go-gitea#31099) Backport go-gitea#31090 by @silverwind 1. Extend concept of go-gitea#29831 to all tabular menus, there were only three left that weren't already `<overflow-menu>`. <img width="634" alt="Screenshot 2024-05-27 at 00 42 16" src="https://github.com/go-gitea/gitea/assets/115237/d9a7e219-d05e-40a1-9e93-777f9a8a90dd"> <img width="965" alt="Screenshot 2024-05-27 at 00 29 32" src="https://github.com/go-gitea/gitea/assets/115237/e6ed71b1-11fb-4a74-9adb-af4524286cff"> 2. Remove extra padding on `fluid padded` container like for example PR diff view. The page margin is already correctly sized via `.ui.container`, so this was just extraneous padding that looked ugly. Before: <img width="1351" alt="Screenshot 2024-05-27 at 00 45 11" src="https://github.com/go-gitea/gitea/assets/115237/4b45fd11-b1b2-4fbb-a618-26eb22be9472"> After: <img width="1344" alt="Screenshot 2024-05-27 at 00 45 22" src="https://github.com/go-gitea/gitea/assets/115237/d09593eb-6c7f-45e7-85b6-f0050047004b"> 3. Replace `gt-word-break` with `tw-break-anywhere` in issue-title, fixing overflow. Before: <img width="1333" alt="Screenshot 2024-05-27 at 00 50 14" src="https://github.com/go-gitea/gitea/assets/115237/64d15d04-b456-401e-a972-df636965f0eb"> After: <img width="1316" alt="Screenshot 2024-05-27 at 00 50 26" src="https://github.com/go-gitea/gitea/assets/115237/ed1ce830-1408-414b-8263-eeaf773f52c8"> Co-authored-by: silverwind <me@silverwind.io>
Backport go-gitea#31106 by wxiaoguang Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Backport go-gitea#31105 by wxiaoguang Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Backport go-gitea#31110 by @lunny Move secrets and badge under actions Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Backport go-gitea#31121 by @silverwind Fixes: go-gitea#31115 <img width="476" alt="image" src="https://github.com/go-gitea/gitea/assets/115237/ba508ba9-b02d-47c6-ad9f-495101c81330"> Co-authored-by: silverwind <me@silverwind.io>
) Backport go-gitea#31118 by @lunny Fix go-gitea#31117 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
…31133) Backport go-gitea#31130 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Backport go-gitea#31091 by @silverwind Fixes: go-gitea#31071 Not perfect but much better than before. Before: Overflows, sticky not working, filename unreadable: <img width="506" alt="Screenshot 2024-05-27 at 02 02 40" src="https://github.com/go-gitea/gitea/assets/115237/a06b1edf-dece-4402-98c2-68670fca265f"> After: <img width="457" alt="Screenshot 2024-05-27 at 01 59 06" src="https://github.com/go-gitea/gitea/assets/115237/2a282c96-e719-4554-b418-81963ae6269c"> Co-authored-by: silverwind <me@silverwind.io>
) (go-gitea#31147) Backport go-gitea#31143 by @HorlogeSkynet --- (fix up for go-gitea#31003) Co-authored-by: Samuel FORESTIER <HorlogeSkynet@users.noreply.github.com>
…ea#31054) (go-gitea#31146) Backport go-gitea#31054 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
…-gitea#31139) (go-gitea#31145) Backport go-gitea#31139 by @Mic92 This allows `nix flake metadata` and nix in general to lock a *branch* tarball link in a manner that causes it to fetch the correct commit even if the branch is updated with a newer version. For further context, Nix flakes are a feature that, among other things, allows for "inputs" that are "github:someuser/somerepo", "https://some-tarball-service/some-tarball.tar.gz", "sourcehut:~meow/nya" or similar. This feature allows our users to fetch tarballs of git-based inputs to their builds rather than using git to fetch them, saving significant download time. There is presently no gitea or forgejo specific fetcher in Nix, and we don't particularly wish to have one. Ideally (as a developer on a Nix implementation myself) we could just use the generic tarball fetcher and not add specific forgejo support, but to do so, we need additional metadata to know which commit a given *branch* tarball represents, which is the purpose of the Link header added here. The result of this patch is that a Nix user can specify `inputs.something.url = "https://forgejo-host/some/project/archive/main.tar.gz"` in flake.nix and get a link to some concrete tarball for the actual commit in the lock file, then when they run `nix flake update` in the future, they will get the latest commit in that branch. Example of it working locally: » nix flake metadata --refresh 'http://localhost:3000/api/v1/repos/jade/cats/archive/main.tar.gz?dir=configs/nix' Resolved URL: http://localhost:3000/api/v1/repos/jade/cats/archive/main.tar.gz?dir=configs/nix Locked URL: http://localhost:3000/api/v1/repos/jade/cats/archive/804ede182b6b66469b23ea4d21eece52766b7a06.tar.gz?dir=configs /nix&narHash=sha256-yP7KkDVfuixZzs0fsqhSETXFC0y8m6nmPLw2GrAMxKQ%3D Description: Computers with the nixos Path: /nix/store/s856c6yqghyan4v0zy6jj19ksv0q22nx-source Revision: 804ede182b6b66469b23ea4d21eece52766b7a06 Last modified: 2024-05-02 00:48:32 For details on the header value, see: https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com> Co-authored-by: Jade Lovelace <software@lfcode.ca> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
… (go-gitea#31152) Backport go-gitea#31122 by @silverwind Fixes: go-gitea#31068 - Now it only does a single call to `GetExpandDirection` per line instead of multiples. - Exposed `data-expand-direction` to frontend so it can correctly size the buttons (it's a pain to do in tables). <img width="142" alt="Screenshot 2024-05-27 at 20 44 56" src="https://github.com/go-gitea/gitea/assets/115237/8b0b45a6-8e50-4081-8822-5e0775d8d941"> <img width="142" alt="Screenshot 2024-05-27 at 20 44 51" src="https://github.com/go-gitea/gitea/assets/115237/b7ba2c57-8f55-4e9f-9606-c96d16b77892"> <img width="132" alt="Screenshot 2024-05-27 at 20 44 46" src="https://github.com/go-gitea/gitea/assets/115237/0e838fb8-5e8c-4250-9843-a68b88d5418b"> <img width="80" alt="Screenshot 2024-05-27 at 20 44 33" src="https://github.com/go-gitea/gitea/assets/115237/da6c7f83-c160-4389-8ab2-889d0568cbe8"> <img width="80" alt="Screenshot 2024-05-27 at 20 44 26" src="https://github.com/go-gitea/gitea/assets/115237/cdb490b2-5040-484a-92e5-46fc5e37c199"> <img width="78" alt="Screenshot 2024-05-27 at 20 44 20" src="https://github.com/go-gitea/gitea/assets/115237/d2978ab0-764e-41ff-922c-25f8fe749f28"> Would backport as trivial enhancement. Co-authored-by: silverwind <me@silverwind.io>
Backport go-gitea#31158 by @wxiaoguang Fix go-gitea#31157 After:  Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Backport go-gitea#31148 by @techknowlogick Reduce accident closing of tickets only to re-open them right away. This aligns the text on these buttons with what GitHub has. Commit is authored by @LazyDodo, and was committed to the Blender fork by @brechtvl Background details: https://projects.blender.org/infrastructure/gitea-custom/pulls/7 Co-authored-by: techknowlogick <techknowlogick@gitea.com> Co-authored-by: Ray Molenkamp <github@lazydodo.com>
Patch taken from issue number 17715, associating the LFS pointer when the file is downloaded.
To avoid accidentally spamming hundreds of people.
Both are off by default. This is implemented fully on the frontend, so all issues and their details are still always loaded.
Delay conflict checking of PRs that had no update in last 24h until page load. This solves the problem where after every commit to main, it takes a long time for conflict checking to update as it goes through many old PRs.
Otherwise for some browsers, users have to login again for every session.
For Blender ID hook to do this.
…repos https://projects.blender.org/infrastructure/blender-projects-platform/issues/61 And add trace log for investigation.
…in fork To make online editing a bit more fool proof.
To be used for RestructuredText rendering using Sphinx to HTML. See: https://projects.blender.org/infrastructure/gitea-custom/src/branch/main/sphinx#deployment
GiteaBot
added
the
lgtm/need 2
Collaborator
|
@bartvdbraak I noticed you've updated the locales for non-English languages. These will be overwritten during the sync from our translation tool Crowdin. If you'd like to contribute your translations, please visit https://crowdin.com/project/gitea. Please revert the changes done on these files. 🍵 |
github-actions
bot
added
modifies/translation
modifies/api
Contributor
Author
|
Apologies for the accidental creation of this PR. I was performing operations on our fork and mistakenly created it. My sincere apologies for any confusion caused. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
19 participants
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.