Local only posts #3224

Open
mkljczk wants to merge 1 commit from gitlab-mr-iid-1957 into develop
Member
No description provided.
Owner

there is one existing implementation #2788

there is one existing implementation https://git.pleroma.social/pleroma/pleroma-fe/pulls/2788
This pull request has changes conflicting with the target branch.
  • src/components/scope_selector/scope_selector.js
  • src/components/status/status.js
  • src/i18n/en.json
View command line instructions

Checkout

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

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