WIP: Add support for mediaproxy preview posters on videos #2491

Draft
feld wants to merge 2 commits from gitlab-mr-iid-1224 into develop
Owner
No description provided.
Author
Owner

I've observed that the NSFW cover breaks this somehow. Click to reveal, video has an empty placeholder.

I've observed that the NSFW cover breaks this somehow. Click to reveal, video has an empty placeholder.
First-time contributor

Wait is the media proxy processing images now? If so that's a big deal, any more info?

Wait is the media proxy processing images now? If so that's a big deal, any more info?
Author
Owner

yes, see here pleroma/pleroma#6311

yes, see here https://git.pleroma.social/pleroma/pleroma/pulls/6311
This pull request has changes conflicting with the target branch.
  • src/components/video_attachment/video_attachment.vue
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-1224:gitlab-mr-iid-1224
git switch gitlab-mr-iid-1224

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-1224
git switch gitlab-mr-iid-1224
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-1224
git switch gitlab-mr-iid-1224
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-1224
git switch develop
git merge --squash gitlab-mr-iid-1224
git switch develop
git merge --ff-only gitlab-mr-iid-1224
git switch develop
git merge gitlab-mr-iid-1224
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!2491
No description provided.