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

Merge upstream 2025-01-12 #29

Merged
sugar merged 5 commits from sugar/forkey:merge-upstream-2025-01-12 into main 2025-01-17 15:28:38 +00:00
Conversation 0 Commits 5 Files changed 12 +53 -44
sugar commented 2025-01-11 23:35:35 +00:00
Owner
Copy link

What

Merge upstream, keeping our fork up to date with upstream.

One commit was reverted, as it concerns kawaii mode, which was deleted. The commit applies cleanly, but shouldn't be there.

Why

Additional info (optional)

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Add story of storybook
  • (If needed) Update CHANGELOG.md
  • (If possible) Add tests
<!-- ℹ お読みください / README PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください: Thank you for your PR! Before creating a PR, please check the contribution guide: https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md --> ## What <!-- このPRで何をしたのか？ どう変わるのか？ --> <!-- What did you do with this PR? How will it change things? --> Merge upstream, keeping our fork up to date with upstream. One commit was reverted, as it concerns kawaii mode, which was deleted. The commit applies cleanly, but shouldn't be there. ## Why <!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ --> <!-- Why do you do it? What are your intentions? What is the problem? --> ## Additional info (optional) <!-- テスト観点など --> <!-- Test perspective, etc --> ## Checklist - [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md) - [ ] Test working in a local environment - [ ] (If needed) Add story of storybook - [ ] (If needed) Update CHANGELOG.md - [ ] (If possible) Add tests
sugar added 4 commits 2025-01-11 23:35:35 +00:00 
(cherry picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/830)

Co-authored-by: Hazelnoot <acomputerdog@gmail.com>
leah approved these changes 2025-01-14 20:46:22 +00:00
sugar force-pushed merge-upstream-2025-01-12 from b1f88ce464 to 76e48ff1bb 2025-01-16 16:44:25 +00:00 Compare
sugar force-pushed merge-upstream-2025-01-12 from 76e48ff1bb to 0de5cbc887 2025-01-17 11:43:01 +00:00 Compare
sugar merged commit 6b4f96a94b into main 2025-01-17 15:28:38 +00:00
sugar deleted branch merge-upstream-2025-01-12 2025-01-17 15:28:45 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
leah
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
2 participants
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#29
No description provided.
Delete branch "sugar/forkey:merge-upstream-2025-01-12"

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?