Skip to content

Actions: pi-hole/FTL

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
2,042 workflow runs
2,042 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

v6 placeholder Check for merge conflicts #3255: Pull request #2153 synchronize by DL6ER
January 27, 2025 05:10 10s
January 27, 2025 05:10 10s
Merge pull request #2122 from pi-hole/new/GRAVITY_RESTORED_MESSAGE Check for merge conflicts #3254: Commit e080884 pushed by DL6ER
January 27, 2025 05:10 2m 11s development
development
January 27, 2025 05:10 2m 11s
Merge branch 'development' into new/GRAVITY_RESTORED_MESSAGE Check for merge conflicts #3253: Commit d982768 pushed by DL6ER
January 26, 2025 18:53 9s new/GRAVITY_RESTORED_MESSAGE
new/GRAVITY_RESTORED_MESSAGE
January 26, 2025 18:53 9s
Add new GRAVITY_RESTORED_MESSAGE message type Check for merge conflicts #3252: Pull request #2122 synchronize by DL6ER
January 26, 2025 18:53 10s
January 26, 2025 18:53 10s
v6 placeholder Check for merge conflicts #3251: Pull request #2153 synchronize by yubiuser
January 26, 2025 05:30 11s
January 26, 2025 05:30 11s
Merge pull request #2167 from pi-hole/dependabot-github_actions-devel… Check for merge conflicts #3250: Commit 0349fd8 pushed by yubiuser
January 26, 2025 05:30 2m 11s development
development
January 26, 2025 05:30 2m 11s
Use larger netlink buffer size Check for merge conflicts #3249: Commit 1b3c3da pushed by DL6ER
January 25, 2025 18:22 13s tweak/nlinks
tweak/nlinks
January 25, 2025 18:22 13s
Add new debug.netlink option and related debugging functionality in t… Check for merge conflicts #3248: Commit 9c69a0b pushed by DL6ER
January 25, 2025 18:03 9s tweak/nlinks
tweak/nlinks
January 25, 2025 18:03 9s
Add new debug.netlink option and related debugging functionality in t… Check for merge conflicts #3247: Commit c4fd461 pushed by DL6ER
January 25, 2025 17:40 11s tweak/nlinks
tweak/nlinks
January 25, 2025 17:40 11s
Add debugging output Check for merge conflicts #3246: Commit 3cf5699 pushed by DL6ER
January 25, 2025 11:23 12s tweak/nlinks
tweak/nlinks
January 25, 2025 11:23 12s
Bump actions/stale in the github_action-dependencies group Check for merge conflicts #3245: Commit a618eef pushed by dependabot bot
January 25, 2025 10:38 10s dependabot-github_actions-development-github_action-dependencies-637f40baaf
dependabot-github_actions-development-github_action-dependencies-637f40baaf
January 25, 2025 10:38 10s
v6 placeholder Check for merge conflicts #3244: Pull request #2153 synchronize by DL6ER
January 24, 2025 19:48 12s
January 24, 2025 19:48 12s
Merge pull request #2166 from pi-hole/update/dnsmasq Check for merge conflicts #3243: Commit ead34f5 pushed by DL6ER
January 24, 2025 19:48 2m 12s development
development
January 24, 2025 19:48 2m 12s
Update dnsmasq to v2.91test9 Check for merge conflicts #3242: Pull request #2166 synchronize by DL6ER
January 24, 2025 18:17 1m 36s
January 24, 2025 18:17 1m 36s
Temporarily install py3-dnspython during the tests until we can again… Check for merge conflicts #3241: Commit 4e6dd97 pushed by DL6ER
January 24, 2025 18:17 1m 15s update/dnsmasq
update/dnsmasq
January 24, 2025 18:17 1m 15s
Update dnsmasq to v2.91test9 Check for merge conflicts #3240: Pull request #2166 synchronize by DL6ER
January 24, 2025 18:16 48s
January 24, 2025 18:16 48s
Temporarily install py3-dnspython during the tests until we can again… Check for merge conflicts #3239: Commit bad95cd pushed by DL6ER
January 24, 2025 18:16 31s update/dnsmasq
update/dnsmasq
January 24, 2025 18:16 31s
Merge pull request #2165 from pi-hole/update/dnsmasq Check for merge conflicts #3238: Commit 84e2ad1 pushed by DL6ER
January 24, 2025 16:36 15s special/CI_development
special/CI_development
January 24, 2025 16:36 15s
Use new dnsmasq tag 2.91test9 Check for merge conflicts #3237: Commit ae6dd21 pushed by DL6ER
January 24, 2025 04:08 11s update/dnsmasq
update/dnsmasq
January 24, 2025 04:08 11s
Improve FTL connection error logging Check for merge conflicts #3236: Commit 3d6bad8 pushed by DL6ER
January 20, 2025 17:12 11s tweak/conn_errors
tweak/conn_errors
January 20, 2025 17:12 11s
v6 placeholder Check for merge conflicts #3235: Pull request #2153 synchronize by DL6ER
January 19, 2025 07:13 2m 9s
January 19, 2025 07:13 2m 9s
Merge pull request #2165 from pi-hole/update/dnsmasq Check for merge conflicts #3234: Commit 84e2ad1 pushed by DL6ER
January 19, 2025 07:13 13s development
development
January 19, 2025 07:13 13s
Update dnsmasq version to most recent tag v2.91test8 Check for merge conflicts #3233: Commit 62010ec pushed by DL6ER
January 19, 2025 06:00 9s update/dnsmasq
update/dnsmasq
January 19, 2025 06:00 9s
Handle DS queries to auth zones. Check for merge conflicts #3232: Commit dc4e9dc pushed by DL6ER
January 18, 2025 19:12 11s update/dnsmasq
update/dnsmasq
January 18, 2025 19:12 11s
v6 placeholder Check for merge conflicts #3231: Pull request #2153 synchronize by DL6ER
January 16, 2025 17:59 15s
January 16, 2025 17:59 15s