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.

Sign up for GitHub

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

Jump to bottom

Fix missing badges in org settings page #24654

Merged
merged 2 commits into from
May 11, 2023
Merged

Fix missing badges in org settings page #24654

merged 2 commits into from
May 11, 2023

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented May 11, 2023

Improve #24232

Before:
image
After:
image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 11, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 11, 2023
@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 May 11, 2023
@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 May 11, 2023
@lunny lunny added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. topic/ui Change the appearance of the Gitea UI labels May 11, 2023
@lunny lunny added this to the 1.20.0 milestone May 11, 2023
@yardenshoham
Copy link
Member

Backport?

@yp05327
Copy link
Contributor Author

yp05327 commented May 11, 2023 •
edited
Loading

#24232 have no backport, so I think this PR should not have backport too.

@silverwind silverwind enabled auto-merge (squash) May 11, 2023 06:52
@silverwind silverwind merged commit b3af748 into go-gitea:main May 11, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 11, 2023
@yp05327
Copy link
Contributor Author

yp05327 commented May 11, 2023

And maybe we can add skip-change-log to this PR.

@yp05327 yp05327 deleted the add-contextuser-in-org-settings branch May 11, 2023 06:59
@yardenshoham yardenshoham added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label May 11, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 12, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
39754d7 
* upstream/main:
  GitHub Actions cleanups (go-gitea#24620)
  Fix issues list page multiple selection update milestones (go-gitea#24660)
  Make repo migration cancelable and fix various bugs (go-gitea#24605)
  Improve queue & process & stacktrace (go-gitea#24636)
  Fix missing badges in org settings page (go-gitea#24654)
  Only show one tippy at a time (go-gitea#24648)
  Reenable creating default webhooks. (go-gitea#24626)
  Kd/fix redis unit test (go-gitea#24650)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 9, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
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. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.
5 participants
@yp05327 @yardenshoham @lunny @silverwind @GiteaBot