Change move namespace, fix/add missing reaction stuff #2336

Open
shpuld wants to merge 2 commits from gitlab-mr-iid-1069 into develop
Member

Changing move namespace into pleroma:move: pleroma/pleroma#5513

Added interactions tab for emoji reactions since I noticed that it was forgotten about in emoji reactions MRs

Changing move namespace into pleroma:move: https://git.pleroma.social/pleroma/pleroma/pulls/5513 Added interactions tab for emoji reactions since I noticed that it was forgotten about in emoji reactions MRs
Author
Member

I don't know how to test this, or moves in general, any suggestions?

I don't know how to test this, or moves in general, any suggestions?
Member

looks ok, dunno how to test it either

looks ok, dunno how to test it either
Member

maybe we should update this @shpuld

i've seen moves work normally without this MR

maybe we should update this @shpuld i've seen moves work normally without this MR
This pull request has changes conflicting with the target branch.
  • src/components/interactions/interactions.js
  • src/components/notification/notification.vue
  • src/i18n/en.json
  • src/modules/statuses.js
  • src/services/entity_normalizer/entity_normalizer.service.js
  • src/services/notification_utils/notification_utils.js
  • src/services/push/push.js
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin gitlab-mr-iid-1069:gitlab-mr-iid-1069
git switch gitlab-mr-iid-1069

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 switch develop
git merge --no-ff gitlab-mr-iid-1069
git switch gitlab-mr-iid-1069
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-1069
git switch gitlab-mr-iid-1069
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-1069
git switch develop
git merge --squash gitlab-mr-iid-1069
git switch develop
git merge --ff-only gitlab-mr-iid-1069
git switch develop
git merge gitlab-mr-iid-1069
git push origin develop
Sign in to join this conversation.
No reviewers
No milestone
No project
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
pleroma/pleroma-fe!2336
No description provided.