Skip to content
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

Fix label-list rendering in timeline, decrease gap #30342

Merged
merged 2 commits into from
Apr 9, 2024

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Apr 8, 2024

Not sure exactly when this regressed, but has been a while I think.

Before:

Screenshot 2024-04-08 at 22 46 50

After:

Screenshot 2024-04-08 at 23 00 58

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 8, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 8, 2024
@silverwind silverwind added the backport/v1.22 This PR should be backported to Gitea 1.22 label Apr 8, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 8, 2024
@silverwind silverwind changed the title Fix label-list rendering, decrease gap Fix label-list rendering in timeline, decrease gap Apr 8, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 9, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 9, 2024
@silverwind silverwind merged commit 8d14266 into go-gitea:main Apr 9, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Apr 9, 2024
@silverwind silverwind deleted the labelflex branch April 9, 2024 06:30
@GiteaBot
Copy link
Collaborator

GiteaBot commented Apr 9, 2024

I was unable to create a backport for 1.22. @silverwind, please send one manually. 🍵

go run ./contrib/backport 30342
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Apr 9, 2024
@silverwind
Copy link
Member Author

Backport depends on #30326 being merged.

@silverwind silverwind removed the backport/manual No power to the bots! Create your backport yourself! label Apr 9, 2024
@silverwind
Copy link
Member Author

@GiteaBot Try again now.

@silverwind silverwind added backport/v1.22 This PR should be backported to Gitea 1.22 and removed backport/v1.22 This PR should be backported to Gitea 1.22 labels Apr 9, 2024
GiteaBot added a commit to GiteaBot/gitea that referenced this pull request Apr 10, 2024
Not sure exactly when this regressed, but has been a while I think.

Before:

<img width="895" alt="Screenshot 2024-04-08 at 22 46 50"
src="https://github.com/go-gitea/gitea/assets/115237/9b1788f8-017e-4fe1-8ab9-938e0d76fb41">

After:

<img width="689" alt="Screenshot 2024-04-08 at 23 00 58"
src="https://github.com/go-gitea/gitea/assets/115237/90193df9-5c24-4a1a-96fe-3d4e8392063c">

Co-authored-by: Giteabot <teabot@gitea.io>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Apr 10, 2024
lunny pushed a commit that referenced this pull request Apr 10, 2024
Backport #30342 by @silverwind

Not sure exactly when this regressed, but has been a while I think.

Before:

<img width="895" alt="Screenshot 2024-04-08 at 22 46 50"
src="https://github.com/go-gitea/gitea/assets/115237/9b1788f8-017e-4fe1-8ab9-938e0d76fb41">

After:

<img width="689" alt="Screenshot 2024-04-08 at 23 00 58"
src="https://github.com/go-gitea/gitea/assets/115237/90193df9-5c24-4a1a-96fe-3d4e8392063c">

Co-authored-by: silverwind <me@silverwind.io>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 10, 2024
* giteaofficial/main:
  Fix line height on inline code preview (go-gitea#30372)
  Refactor more filterslice (go-gitea#30370)
  Fix ambiguous id when fetch Actions tasks (go-gitea#30382)
  Fix floated list items (go-gitea#30377)
  Fix actions design about default actions download url (go-gitea#30360)
  Add container.FilterSlice function (go-gitea#30339)
  Fix label-list rendering in timeline, decrease gap (go-gitea#30342)
  Performance optimization for git push (go-gitea#30104)
  Reduce checkbox size to 15px (go-gitea#30346)
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 27, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants