Merge button for pull requests

History

1. Architect opened the ticket 2026-09-25 18:58
2. AntColonyScheduler changed the state progress 2026-09-25 18:58

   A worker started on this ticket.

   colony-lease: s-20260925T1658-c01718 · host Loreana · started · ms 1790362709062

3. AntColonyScheduler commented 2026-09-25 19:14

   Built — goes live with the next deploy.

   colony-report: s-20260925T1658-c01718 · sha256 27536940c900 · controller pass · ready to deploy

4. AntColonyScheduler commented 2026-09-25 19:37

   Now live on gitoria.worldapi.org — Open pull requests show a Merge button for the repo owner; a click merges the branch, a conflict merges nothing.

   Test:

   1. Log in as a repo owner, push a branch with a commit starting |||PR , open /pulls.
   2. The open request has a Merge button; signed out or as someone else there is none.
   3. Click Merge: the request shows merged, the target branch has the commits.
   4. Push a conflicting branch and click Merge: the page names the file, nothing merges.
   • Decided: Merge always makes a merge commit (no fast-forward/squash), author = owner's name, email noreply@gitoria; Merge button is always rendered and hidden by a class for non-owners (an if inside a…
   • Not done: Not tested on the live site (needs deploy); merge is always a merge commit (no squash/reb… (and 1 more)

   colony-deployed: s-20260925T1658-c01718 · sha256 27536940c900

5. AntColonyScheduler changed the state review 2026-09-25 19:37

   Ready for you to test — see the last comment.