woem.men/forkey
4
2
Fork 3
Code Issues 34 Pull requests 16 Projects Releases Packages Wiki Activity Actions

Cherrypicked mute, blocked, and boosts muted badges #50

Open
leah wants to merge 3 commits from feature/indicate-block-mute into main
pull from: feature/indicate-block-mute
merge into: woem.men:main
Conversation 0 Commits 3 Files changed 4 +34 -8
leah commented 2025-01-19 19:28:07 +00:00
Owner
Copy link

Adds the muted, blocked, and boosts muted badges
image

Cherrypicked from sharkey
https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/659

Adds the muted, blocked, and boosts muted badges ![image](/attachments/302a3dcb-9795-4555-8369-a0653d07f1c4) Cherrypicked from sharkey https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/659
image.png
71 KiB
image.png
67 KiB
image.png
leah added 2 commits 2025-01-19 19:28:08 +00:00
moved them a bit closer
All checks were successful
Lint / pnpm_install (pull_request) Successful in 2m27s
Details
Test (frontend) / vitest (22.x) (pull_request) Successful in 3m38s
Details
Test (production install and build) / production (22.x) (pull_request) Successful in 2m51s
Details
Lint / lint (backend) (pull_request) Successful in 9m35s
Details
Lint / lint (frontend) (pull_request) Successful in 12m43s
Details
Lint / lint (misskey-js) (pull_request) Successful in 6m45s
Details
Lint / lint (sw) (pull_request) Successful in 4m20s
Details
Lint / typecheck (backend) (pull_request) Successful in 4m49s
Details
Lint / typecheck (misskey-js) (pull_request) Successful in 4m48s
Details
582d559fb8
leah added 1 commit 2025-01-19 21:44:37 +00:00
Merge branch 'main' into feature/indicate-block-mute
All checks were successful
Lint / pnpm_install (pull_request) Successful in 1m45s
Details
Test (frontend) / vitest (22.x) (pull_request) Successful in 2m48s
Details
Test (production install and build) / production (22.x) (pull_request) Successful in 2m16s
Details
Lint / typecheck (backend) (pull_request) Successful in 2m59s
Details
Lint / typecheck (misskey-js) (pull_request) Successful in 2m9s
Details
Lint / lint (backend) (pull_request) Successful in 2m25s
Details
Lint / lint (misskey-js) (pull_request) Successful in 2m11s
Details
Lint / lint (sw) (pull_request) Successful in 1m58s
Details
Lint / lint (frontend) (pull_request) Successful in 20m44s
Details
296daab128
All checks were successful
Lint / pnpm_install (pull_request) Successful in 1m45s
Details
Test (frontend) / vitest (22.x) (pull_request) Successful in 2m48s
Details
Test (production install and build) / production (22.x) (pull_request) Successful in 2m16s
Details
Lint / typecheck (backend) (pull_request) Successful in 2m59s
Details
Lint / typecheck (misskey-js) (pull_request) Successful in 2m9s
Details
Lint / lint (backend) (pull_request) Successful in 2m25s
Details
Lint / lint (misskey-js) (pull_request) Successful in 2m11s
Details
Lint / lint (sw) (pull_request) Successful in 1m58s
Details
Lint / lint (frontend) (pull_request) Successful in 20m44s
Details
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/indicate-block-mute:feature/indicate-block-mute
git checkout feature/indicate-block-mute

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff feature/indicate-block-mute
git checkout feature/indicate-block-mute
git rebase main
git checkout main
git merge --ff-only feature/indicate-block-mute
git checkout feature/indicate-block-mute
git rebase main
git checkout main
git merge --no-ff feature/indicate-block-mute
git checkout main
git merge --squash feature/indicate-block-mute
git checkout main
git merge --ff-only feature/indicate-block-mute
git checkout main
git merge feature/indicate-block-mute
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
customization

Change something to be more suitable for forkey

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
feature parity

Another fork has this feature, and it should be pulled into this fork.

  
help wanted

Need some help

  
high priority

   
invalid

Something is wrong

  
low priority

   
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
customization
duplicate
enhancement
feature parity
help wanted
high priority
invalid
low priority
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: woem.men/forkey#50
No description provided.
Delete branch "feature/indicate-block-mute"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?