wip: mastodon #1

Draft

jem wants to merge 8 commits from mastodon into gts-testing

pull from: mastodon

merge into: meissa:gts-testing

meissa:main

meissa:analyze-user-activity-issue

meissa:e2e-dev-ap-forgejo-mastodon

meissa:forgejo-in-compose

meissa:e2e-structure-proposal

meissa:gts-testing

Conversation 0 Commits 8 Files changed 12 +708 -14

jem commented 2025-11-11 06:44:10 +00:00

Owner

Copy link

No description provided.

jem added 8 commits 2025-11-11 06:44:11 +00:00

federation: add scenario-gotosocial fe96f82e7f

build forgejo 13.0 from meissa/forgejo pr4767-7 41ca1c7e10

federation/gotosocial: update to gotosocial 0.20-rc1; prepare for Mastodon reuse e9c1015602

federation: add scenario-mastodon 0aae085799

build docker from trixie; add compose dependencies 70d5fdee0d

lib: ensure that podman-compose is installed ad64da38aa

federation: make scenario-gotosocial script compatible with Mastodon API c507c8587e

tmp: add scenario-mastodon to federation.sh ... 0b94cef0c1

Rebase this into the main addition

Some checks failed

Hide checks

/ packages (pull_request) Has been cancelled

Details

/ actions (pull_request) Has been cancelled

Details

/ build (pull_request) Has been cancelled

Details

/ federation (pull_request) Has been cancelled

Details

/ upgrade and storage (pull_request) Has been cancelled

Details

This pull request has changes conflicting with the target branch.

• federation/federation.sh
• federation/scenario-gotosocial/run.sh
• federation/scenario-gotosocial/setup.sh
• lib/lib.sh

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'wip: mastodon' (#1) from mastodon into gts-testing

Merge commit body Reviewed-on: https://repo.prod.meissa.de/meissa/forgejo-end-to-end/pulls/1

Merge pull request 'wip: mastodon' (#1) from mastodon into gts-testing Reviewed-on: https://repo.prod.meissa.de/meissa/forgejo-end-to-end/pulls/1 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin mastodon:mastodon

git switch mastodon

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 gts-testing

git merge --no-ff mastodon

git switch mastodon

git rebase gts-testing

git switch gts-testing

git merge --ff-only mastodon

git switch mastodon

git rebase gts-testing

git switch gts-testing

git merge --no-ff mastodon

git switch gts-testing

git merge --squash mastodon

git switch gts-testing

git merge --ff-only mastodon

git switch gts-testing

git merge mastodon

git push origin gts-testing

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

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

meissa/forgejo-end-to-end!1

No description provided.