b1f3069a22
- Resolves #476 - Follow up for: #540 - Ensure that the doer and blocked person cannot follow each other. - Ensure that the block person cannot watch doer's repositories. - Add unblock button to the blocked user list. - Add blocked since information to the blocked user list. - Add extra testing to moderation code. - Blocked user will unwatch doer's owned repository upon blocking. - Add flash messages to let the user know the block/unblock action was successful. - Add "You haven't blocked any users" message. - Add organization blocking a user. Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/802 (cherry picked from commit0505a10421) (cherry picked from commit37b4e6ef9b) (cherry picked from commitc17c121f2c) [MODERATION] organization blocking a user (#802) (squash) Changes to adapt to:6bbccdd177Improve AJAX link and modal confirm dialog (#25210) Refs: https://codeberg.org/forgejo/forgejo/pulls/882/files#issuecomment-945962 Refs: https://codeberg.org/forgejo/forgejo/pulls/882#issue-330561 (cherry picked from commit523635f83c) (cherry picked from commit4743eaa6a0) (cherry picked from commiteff5b43d2e) Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014 routers/web/user/profile.go (cherry picked from commit9d359be5ed)
35 lines
339 B
YAML
35 lines
339 B
YAML
-
|
|
id: 1
|
|
user_id: 1
|
|
repo_id: 1
|
|
mode: 1 # normal
|
|
|
|
-
|
|
id: 2
|
|
user_id: 4
|
|
repo_id: 1
|
|
mode: 1 # normal
|
|
|
|
-
|
|
id: 3
|
|
user_id: 9
|
|
repo_id: 1
|
|
mode: 1 # normal
|
|
|
|
-
|
|
id: 4
|
|
user_id: 8
|
|
repo_id: 1
|
|
mode: 2 # don't watch
|
|
|
|
-
|
|
id: 5
|
|
user_id: 11
|
|
repo_id: 1
|
|
mode: 3 # auto
|
|
|
|
-
|
|
id: 6
|
|
user_id: 4
|
|
repo_id: 2
|
|
mode: 1 # normal
|