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,242 workflow runs
2,242 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump actions/checkout from 3.5.3 to 4.0.0 Check for merge conflicts #880: Commit b1810c7 pushed by dependabot bot
September 9, 2023 10:31 11s dependabot-github_actions-development-actions-checkout-4.0.0
dependabot-github_actions-development-actions-checkout-4.0.0
September 9, 2023 10:31 11s
Bump actions/upload-artifact from 3.1.2 to 3.1.3 Check for merge conflicts #879: Commit 305e55f pushed by dependabot bot
September 9, 2023 10:31 10s dependabot-github_actions-development-actions-upload-artifact-3.1.3
dependabot-github_actions-development-actions-upload-artifact-3.1.3
September 9, 2023 10:31 10s
Clear web session on external password change Check for merge conflicts #878: Pull request #1630 synchronize by DL6ER
September 7, 2023 17:53 26s
September 7, 2023 17:53 26s
Compare password hashes, not password (we don't store them in memory) Check for merge conflicts #877: Commit 8a8dd06 pushed by DL6ER
September 7, 2023 17:53 24s tweak/clr_sess_on_pw_change
tweak/clr_sess_on_pw_change
September 7, 2023 17:53 24s
Add ability to specify domains, lists, clients and group names as arrays Check for merge conflicts #876: Pull request #1629 synchronize by DL6ER
September 7, 2023 17:46 11s
September 7, 2023 17:46 11s
Fix spellcheck error Check for merge conflicts #875: Commit a755396 pushed by DL6ER
September 7, 2023 17:46 12s tweak/domain_array
tweak/domain_array
September 7, 2023 17:46 12s
Add ability to specify domains, lists, clients and group names as arrays Check for merge conflicts #874: Pull request #1629 synchronize by DL6ER
September 7, 2023 17:41 14s
September 7, 2023 17:41 14s
Ensure we free the row.items object only when we have actually alloca… Check for merge conflicts #873: Commit 06922d9 pushed by DL6ER
September 7, 2023 17:41 15s tweak/domain_array
tweak/domain_array
September 7, 2023 17:41 15s
Add ability to specify domains, lists, clients and group names as arrays Check for merge conflicts #872: Pull request #1629 synchronize by DL6ER
September 6, 2023 23:39 14s
September 6, 2023 23:39 14s
Free row.items only after having used row.item one last time Check for merge conflicts #871: Commit 506750e pushed by DL6ER
September 6, 2023 23:39 12s tweak/domain_array
tweak/domain_array
September 6, 2023 23:39 12s
Apply Pi-hole specific changes to SQLite3 code Check for merge conflicts #870: Commit bb34b11 pushed by DL6ER
September 6, 2023 22:48 13s update/sqlite_3.43.0
update/sqlite_3.43.0
September 6, 2023 22:48 13s
Add ability to specify domains, lists, clients and group names as arrays Check for merge conflicts #869: Pull request #1629 synchronize by DL6ER
September 6, 2023 19:00 15s
September 6, 2023 19:00 15s
Check eeach element for spaces Check for merge conflicts #868: Commit b9a5187 pushed by DL6ER
September 6, 2023 18:59 15s tweak/domain_array
tweak/domain_array
September 6, 2023 18:59 15s
Simplify deletion of sessions Check for merge conflicts #867: Commit 7772188 pushed by DL6ER
September 6, 2023 17:15 10s tweak/clr_sess_on_pw_change
tweak/clr_sess_on_pw_change
September 6, 2023 17:15 10s
Add ability to specify domains, lists, clients and group names as arr… Check for merge conflicts #866: Commit c7a7e66 pushed by DL6ER
September 6, 2023 17:15 16s tweak/domain_array
tweak/domain_array
September 6, 2023 17:15 16s
Merge pull request #1628 from pi-hole/update/dnsmasq Check for merge conflicts #865: Commit 718ba53 pushed by DL6ER
September 4, 2023 09:39 2m 16s development-v6
development-v6
September 4, 2023 09:39 2m 16s
Merge pull request #1627 from pi-hole/new/pcap Check for merge conflicts #864: Commit 83e2cce pushed by DL6ER
September 3, 2023 17:57 2m 11s development-v6
development-v6
September 3, 2023 17:57 2m 11s
Merge branch 'development-v6' into update/dnsmasq Check for merge conflicts #863: Commit b8d1db6 pushed by DL6ER
September 3, 2023 04:57 11s update/dnsmasq
update/dnsmasq
September 3, 2023 04:57 11s
Fix problem with arbitrary RR caching. Check for merge conflicts #862: Commit b012828 pushed by DL6ER
September 3, 2023 04:57 11s update/dnsmasq
update/dnsmasq
September 3, 2023 04:57 11s
Fix hostname test Check for merge conflicts #861: Commit dda95b4 pushed by DL6ER
September 2, 2023 18:03 21s new/pcap
new/pcap
September 2, 2023 18:03 21s
Merge pull request #1626 from pi-hole/dependabot-github_actions-devel… Check for merge conflicts #860: Commit 9da3e60 pushed by yubiuser
September 2, 2023 15:08 2m 12s development-v6
development-v6
September 2, 2023 15:08 2m 12s
Bump docker/setup-buildx-action from 2.9.1 to 2.10.0 Check for merge conflicts #859: Commit a7c32ea pushed by dependabot bot
September 2, 2023 10:36 11s dependabot-github_actions-development-v6-docker-setup-buildx-action-2.10.0
dependabot-github_actions-development-v6-docker-setup-buildx-action-2.10.0
September 2, 2023 10:36 11s
Merge pull request #1625 from pi-hole/dependabot-github_actions-devel… Check for merge conflicts #858: Commit 0705c01 pushed by yubiuser
August 26, 2023 11:16 2m 10s development-v6
development-v6
August 26, 2023 11:16 2m 10s
Bump actions/checkout from 3.5.3 to 3.6.0 Check for merge conflicts #857: Commit a990439 pushed by dependabot bot
August 26, 2023 10:14 10s dependabot-github_actions-development-v6-actions-checkout-3.6.0
dependabot-github_actions-development-v6-actions-checkout-3.6.0
August 26, 2023 10:14 10s
Bump actions/checkout from 3.5.3 to 3.6.0 Check for merge conflicts #856: Commit 4add6db pushed by dependabot bot
August 26, 2023 10:04 12s dependabot-github_actions-development-actions-checkout-3.6.0
dependabot-github_actions-development-actions-checkout-3.6.0
August 26, 2023 10:04 12s
ProTip! You can narrow down the results and go further in time using created:<2023-08-26 or the other filters available.