n8n+webhost: strip caddy/homepage/PUID — pocket is internal, flame + status directives only #5

Open

gremlin wants to merge 1 commit from gremlin/pocket-clean-labels into main AGit

pull from: gremlin/pocket-clean-labels

merge into: traveler:main

traveler:main

Conversation 0 Commits 1 Files changed 2 +7 -29

gremlin commented 2026-07-04 23:55:17 -05:00

Contributor

Copy link

No description provided.

gremlin added 3 commits 2026-07-04 23:55:17 -05:00

imp: add pocket-sync.sh to version control (was dataset-only) 6349bad69b

webhost: imp theme (red/purple, Pocket Grimoire badge) — shared imp.css mirroring gremlin teal theme 3ca679df69

n8n+webhost: strip caddy/homepage/PUID — pocket is internal, flame + status directives only d5d4ec9744

This pull request has changes conflicting with the target branch.

• n8n/docker-compose.yaml
• webhost/docker-compose.yaml

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'n8n+webhost: strip caddy/homepage/PUID — pocket is internal, flame + status directives only' (#5) from gremlin/pocket-clean-labels into main

Merge commit body Reviewed-on: https://git.netgrimoire.com/traveler/pocket/pulls/5

Merge pull request 'n8n+webhost: strip caddy/homepage/PUID — pocket is internal, flame + status directives only' (#5) from gremlin/pocket-clean-labels into main Reviewed-on: https://git.netgrimoire.com/traveler/pocket/pulls/5 Copy merge commit message

Checkout

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

git fetch -u origin +refs/pull/5/head:gremlin/pocket-clean-labels

git switch gremlin/pocket-clean-labels

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 main

git merge --no-ff gremlin/pocket-clean-labels

git switch gremlin/pocket-clean-labels

git rebase main

git switch main

git merge --ff-only gremlin/pocket-clean-labels

git switch gremlin/pocket-clean-labels

git rebase main

git switch main

git merge --no-ff gremlin/pocket-clean-labels

git switch main

git merge --squash gremlin/pocket-clean-labels

git switch main

git merge --ff-only gremlin/pocket-clean-labels

git switch main

git merge gremlin/pocket-clean-labels

git push origin main

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

traveler/pocket!5

No description provided.