3 people e3a43af379 fix(user): allow unblocking users promoted to admin (#39192) (#39402) ...

Backport #39192 by @loveulvu

Fixes #39189.

`IsUserBlockedBy` intentionally treats admin users as not blocked, but
`CanUnblockUser` was also using it to determine whether a blocking
relationship exists. If a previously blocked user is later promoted to
admin, the existing `user_blocking` record remains but can no longer be
removed.

This change separates those two concerns by adding `HasBlocking` for
checking the persisted blocking relationship. `CanUnblockUser` uses that
relationship check while `IsUserBlockedBy` keeps its existing admin-user
behavior.

A regression test verifies that an admin is still not considered blocked
while an existing blocking relationship can still be unblocked.

Tests:
- `go test ./models/user ./services/user -count=1`

Co-authored-by: Even <412401474@qq.com>

2026-09-23 20:26:48 +02:00

..

actions

fix(actions): enforce fork pull request trust boundaries (#39005) (#39018)

2026-08-21 14:25:59 +00:00

agit

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

asymkey

fix(asymkey): do not verify OpenPGP signatures with an SSH instance key (#39073) (#39086)

2026-08-25 19:24:22 +00:00

attachment

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

auth

fix: update collaborator access mode and httpsign (#38894, #38862) (#38895)

2026-08-13 09:59:07 +00:00

automerge

fix(pull): keep the merged state in sync with git (#39062) (#39118)

2026-08-25 17:33:09 +00:00

automergequeue

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

context

fix: backport various fixes (#39203, #39236, #39239, #39248, #39251) (#39252)

2026-09-06 22:05:11 +08:00

contexttest

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

convert

fix: resolve YAML anchors and aliases in Actions workflows (#38984) (#38996)

2026-08-20 11:16:33 +02:00

cron

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

doctor

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

externalaccount

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

feed

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

forms

fix(repo): limit gitignore template selections (#39027) (#39040)

2026-08-22 10:26:37 +00:00

git

perf: Various performance regression fixes (#38078)

2026-06-21 14:34:07 +00:00

gitdiff

fix: charset lookup (#39187) (#39197)

2026-09-01 08:35:50 +02:00

indexer

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

issue

refactor: Use db.Get[] instead of db.GetEngine(ctx).Get(bean) to avoid zero value fetching wrong database record (#37977)

2026-06-27 10:24:02 -07:00

lfs

fix(lfs): failed upload deletes a concurrent upload's meta object (#38693) (#38722)

2026-07-31 13:41:26 +00:00

mailer

fix: mail template for push event (#38467) (#38468)

2026-07-15 18:57:03 +02:00

markup

fix(markup): enforce same-repository issue access (#39045) (#39054)

2026-08-22 20:06:24 +00:00

migrations

fix(migrations): cancel GitLab version probes (#39023) (#39035)

2026-08-22 08:52:31 +00:00

mirror

fix: revert git clone http redirection forbidden (#38530) (#38545)

2026-07-20 17:21:17 +02:00

notify

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

oauth2_provider

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

org

fix: various security fixes (#38406) (#38426)

2026-07-12 17:41:58 +00:00

packages

fix: backport various fixes (#39203, #39236, #39239, #39248, #39251) (#39252)

2026-09-06 22:05:11 +08:00

projects

fix: various security fixes (#38406) (#38426)

2026-07-12 17:41:58 +00:00

pull

fix: correct stdErr match in isErrBlameNotFoundOrNotEnoughLines (#39309) (#39311)

2026-09-15 07:19:17 +08:00

release

fix(release): validate web attachment renames against allowed types (#38314) (#38328)

2026-07-04 17:45:11 +02:00

repository

fix(pull): keep the merged state in sync with git (#39062) (#39118)

2026-08-25 17:33:09 +00:00

secrets

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

task

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

uinotification

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

user

fix(user): allow unblocking users promoted to admin (#39192) (#39402)

2026-09-23 20:26:48 +02:00

versioned_migration

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

webhook

fix(webhook): remove slack channel name check (#38608) (#38612)

2026-07-24 08:09:05 +00:00

webtheme

fix(frontend): resolve Vite assets by manifest source path (#37836)

2026-05-28 06:14:52 +00:00

wiki

fix: api error message (#38031)

2026-06-08 16:58:42 +08:00