Skip to content

Fix last admin check when syncing users #34649

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

Merged
merged 3 commits into from
Jun 9, 2025
Merged

Conversation

wxiaoguang
Copy link
Contributor

Fix #34358

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 8, 2025
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code labels Jun 8, 2025
@wxiaoguang wxiaoguang added backport/v1.24 This PR should be backported to Gitea 1.24 type/bug labels Jun 8, 2025
@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 Jun 8, 2025
@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 Jun 9, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 9, 2025
@lunny lunny enabled auto-merge (squash) June 9, 2025 20:31
@lunny lunny merged commit 0082cb5 into go-gitea:main Jun 9, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.25.0 milestone Jun 9, 2025
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jun 9, 2025
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jun 9, 2025
lunny pushed a commit that referenced this pull request Jun 9, 2025
@wxiaoguang wxiaoguang deleted the fix-admin-sync branch June 9, 2025 23:44
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 10, 2025
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Fix last admin check when syncing users (go-gitea#34649)
  Update x/crypto package and make builtin SSH use default parameters (go-gitea#34667)
  Fix "oras" OCI client compatibility (go-gitea#34666)
  Fix: skip paths check on tag push events in workflows (go-gitea#34602)
  Fix footnote jump behavior on the issue page. (go-gitea#34621)
  Only activity tab needs heatmap data loading (go-gitea#34652)
  Ignore "Close" error when uploading container blob (go-gitea#34620)
  Keeping consistent between UI and API about combined commit status state and fix some bugs (go-gitea#34562)
  Refactor FindOrgOptions to use enum instead of bool, fix membership visibility (go-gitea#34629)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/done All backports for this PR have been created backport/v1.24 This PR should be backported to Gitea 1.24 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Integration with OIDC is misbehaving
4 participants