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
1,748 workflow runs
1,748 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update zone update test script Check for merge conflicts #4977: Commit 5069c9c pushed by DL6ER
7s update/dnsmasq
update/dnsmasq
7s
Merge pull request #2809 from pi-hole/revert-2798-update/sqlite3_52_0 Check for merge conflicts #4976: Commit e16ce86 pushed by DL6ER
2m 7s development
development
2m 7s
Update embedded SQLite3 to 3.51.3 Check for merge conflicts #4975: Commit 601880f pushed by DL6ER
6s revert-2798-update/sqlite3_52_0
revert-2798-update/sqlite3_52_0
6s
Revert "Update embedded SQLite3 to 3.52.0" Check for merge conflicts #4974: Commit 80ddb8c pushed by DL6ER
8s revert-2798-update/sqlite3_52_0
revert-2798-update/sqlite3_52_0
8s
Merge pull request #2808 from pi-hole/dependabot-github_actions-devel… Check for merge conflicts #4973: Commit 99753a9 pushed by yubiuser
2m 7s development
development
2m 7s
Bump the github_action-dependencies group across 1 directory with 2 u… Check for merge conflicts #4972: Commit a497085 pushed by dependabot bot
51s dependabot-github_actions-development-github_action-dependencies-c16dd46cb3
dependabot-github_actions-development-github_action-dependencies-c16dd46cb3
51s
Merge pull request #2806 from pi-hole/query_frequency/padd Check for merge conflicts #4971: Commit 2fc50ec pushed by yubiuser
2m 6s development
development
2m 6s
Merge pull request #2804 from pi-hole/form-action Check for merge conflicts #4970: Commit 5defa96 pushed by yubiuser
2m 9s development
development
2m 9s
Merge pull request #2803 from pi-hole/fix/import_api_sessions_earlier Check for merge conflicts #4969: Commit 86f690a pushed by DL6ER
2m 8s development
development
2m 8s
Add query_frequency to /padd endpoint Check for merge conflicts #4968: Pull request #2806 synchronize by yubiuser
5s
5s
Add query_frequency to /padd endpoint Check for merge conflicts #4967: Commit 4d774b5 pushed by yubiuser
7s query_frequency/padd
query_frequency/padd
7s
Add query_frequency to /padd endpoint Check for merge conflicts #4966: Pull request #2806 synchronize by yubiuser
6s
6s
Add query_frequency to /padd endpoint Check for merge conflicts #4965: Commit 43efbf6 pushed by yubiuser
8s query_frequency/padd
query_frequency/padd
8s
Add query_frequency to /padd endpoint Check for merge conflicts #4964: Commit be6f2f0 pushed by yubiuser
7s query_frequency/padd
query_frequency/padd
7s
Add form-action 'self' to Content-Security-Policy Check for merge conflicts #4963: Pull request #2804 synchronize by yubiuser
7s
7s
Add form-action 'self' to Content-Security-Policy Check for merge conflicts #4962: Commit c1c9cd7 pushed by yubiuser
9s form-action
form-action
9s
Ensure API sessions are restored before starting the HTTP server Check for merge conflicts #4961: Pull request #2803 synchronize by DL6ER
8s
8s
Use PID file instead of hoping pidof will return the right PID. Furth… Check for merge conflicts #4960: Commit 9b1425b pushed by DL6ER
7s fix/import_api_sessions_earlier
fix/import_api_sessions_earlier
7s
Ensure API sessions are restored before starting the HTTP server Check for merge conflicts #4959: Pull request #2803 synchronize by DL6ER
9s
9s
Use PID file instead of hoping pidof will return the right PID Check for merge conflicts #4958: Commit 0eb5fe8 pushed by DL6ER
9s fix/import_api_sessions_earlier
fix/import_api_sessions_earlier
9s
Add form-action 'self' to Content-Security-Policy Check for merge conflicts #4957: Commit 670e935 pushed by yubiuser
8s form-action
form-action
8s
Ensure API sessions are restored before starting the HTTP server Check for merge conflicts #4956: Pull request #2803 synchronize by DL6ER
6s
6s
Wait in Teleporter test until FTL is again ready. Otherwise, followin… Check for merge conflicts #4955: Commit a5e1d09 pushed by DL6ER
7s fix/import_api_sessions_earlier
fix/import_api_sessions_earlier
7s
Merge pull request #2791 from pi-hole/fix/groups_by_name Check for merge conflicts #4954: Commit b0419a9 pushed by DL6ER
2m 9s development
development
2m 9s
Ensure API sessions are restored before starting the HTTP server Check for merge conflicts #4953: Pull request #2803 synchronize by DL6ER
7s
7s