9 Commits

Author SHA1 Message Date
RavMorgan
44ad721a3a Revert "Revert "self-hosted" (#94)" (#98)
This reverts commit 047171a475a56d94dacc10ba4c96222a543a2e15.

Co-authored-by: Mona Hmiza <>
2024-01-17 12:08:39 +03:00
RavMorgan
a8ac3c34bc Revert "self-hosted" (#94)
* Revert "self-hosted"
2024-01-17 12:08:17 +03:00
RavMorgan
436eb398ce self-hosted 2024-01-17 12:07:57 +03:00
metalgearsloth
033e87aa3b Don't run CI For PJBot (#13188)
I have no idea what I'm doing
2022-12-26 17:37:57 -06:00
ike709
640e2dac89 Stop labeling draft PRs with merge conflicts (#9089) 2022-06-23 18:25:34 -07:00
ike709
381bcf7c91 Don't flag merge conflicts on draft PRs (#8821) 2022-06-14 17:20:27 +10:00
ike709
1af683ee90 Revert "Remove merge conflict comment" (#8820) 2022-06-13 18:45:23 +02:00
wrexbe
a39233c6ff Remove merge conflict comment (#8819) 2022-06-13 08:03:00 -07:00
Moony
ab1b37ebbf Add a merge conflict check. (#8626)
* Add a merge conflict check.

This is directly copied from https://github.com/wixoaGit/OpenDream/pull/648

* Update .github/workflows/conflict-labeler.yml

Co-authored-by: ike709 <ike709@users.noreply.github.com>

Co-authored-by: ike709 <ike709@users.noreply.github.com>
2022-06-04 20:34:48 -07:00