Skip to content

Actions: pi-hole/docs

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
807 workflow runs
807 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add authentication documentation Check for merge conflicts #513: Pull request #950 synchronize by DL6ER
November 3, 2023 18:25 12s
November 3, 2023 18:25 12s
The SID should actually be URL-encoded in the query method Check for merge conflicts #512: Commit 277e51b pushed by DL6ER
November 3, 2023 18:25 12s new/auth
new/auth
November 3, 2023 18:25 12s
Add authentication documentation Check for merge conflicts #511: Pull request #950 synchronize by DL6ER
November 3, 2023 18:14 15s
November 3, 2023 18:14 15s
Fix copy-paste error in the suggested URI Check for merge conflicts #510: Commit 62ba878 pushed by DL6ER
November 3, 2023 18:14 11s new/auth
new/auth
November 3, 2023 18:14 11s
Add authentication documentation Check for merge conflicts #509: Pull request #950 synchronize by DL6ER
November 3, 2023 17:57 9s
November 3, 2023 17:57 9s
Apply suggestions from code review Check for merge conflicts #508: Commit 96117fd pushed by DL6ER
November 3, 2023 17:57 11s new/auth
new/auth
November 3, 2023 17:57 11s
Pi-hole v6.0 documentation Check for merge conflicts #507: Pull request #338 synchronize by PromoFaux
November 3, 2023 14:30 11s
November 3, 2023 14:30 11s
Merge pull request #947 from pi-hole/update/dev Check for merge conflicts #506: Commit 1529c54 pushed by PromoFaux
November 3, 2023 14:30 2m 11s release/v6.0
release/v6.0
November 3, 2023 14:30 2m 11s
Merge pull request #948 from pi-hole/update/dev_master Check for merge conflicts #505: Commit 16181c1 pushed by PromoFaux
November 3, 2023 14:14 2m 13s master
master
November 3, 2023 14:14 2m 13s
Add authentication documentation Check for merge conflicts #504: Pull request #950 synchronize by DL6ER
November 2, 2023 10:41 12s
November 2, 2023 10:41 12s
Add C example Check for merge conflicts #503: Commit b89107e pushed by DL6ER
November 2, 2023 10:41 11s new/auth
new/auth
November 2, 2023 10:41 11s
Add authentication documentation Check for merge conflicts #502: Commit 5a4dc22 pushed by DL6ER
November 2, 2023 10:26 17s new/auth
new/auth
November 2, 2023 10:26 17s
Pi-hole v6.0 documentation Check for merge conflicts #501: Pull request #338 synchronize by yubiuser
October 30, 2023 20:35 13s
October 30, 2023 20:35 13s
Merge pull request #949 from NittanySeaLion/release/v6.0 Check for merge conflicts #500: Commit 885cc9b pushed by yubiuser
October 30, 2023 20:35 2m 15s release/v6.0
release/v6.0
October 30, 2023 20:35 2m 15s
Update Node to 20 Check for merge conflicts #499: Pull request #947 synchronize by yubiuser
October 29, 2023 19:55 13s
October 29, 2023 19:55 13s
Fix spellcheck Check for merge conflicts #498: Commit edeb780 pushed by yubiuser
October 29, 2023 19:55 12s update/dev
update/dev
October 29, 2023 19:55 12s
Update Node to 20 Check for merge conflicts #497: Pull request #948 synchronize by yubiuser
October 29, 2023 19:55 12s
October 29, 2023 19:55 12s
Fix spellcheck Check for merge conflicts #496: Commit 70541b3 pushed by yubiuser
October 29, 2023 19:55 13s update/dev_master
update/dev_master
October 29, 2023 19:55 13s
Update Node to 20 Check for merge conflicts #495: Commit cfe15fb pushed by yubiuser
October 29, 2023 19:53 10s update/dev_master
update/dev_master
October 29, 2023 19:53 10s
Update Node to 20 Check for merge conflicts #494: Pull request #947 synchronize by yubiuser
October 29, 2023 19:52 12s
October 29, 2023 19:52 12s
Update Node to 20 Check for merge conflicts #493: Commit 2b8a7fe pushed by yubiuser
October 29, 2023 19:52 14s update/dev
update/dev
October 29, 2023 19:52 14s
Update Node to 20 and Netlify's Python to 3.11 Check for merge conflicts #492: Commit bd320c3 pushed by yubiuser
October 29, 2023 19:44 12s update/dev
update/dev
October 29, 2023 19:44 12s
Pi-hole v6.0 documentation Check for merge conflicts #491: Pull request #338 synchronize by yubiuser
October 28, 2023 12:10 16s
October 28, 2023 12:10 16s
Merge pull request #946 from pi-hole/dependabot/npm_and_yarn/release/… Check for merge conflicts #490: Commit 282290e pushed by yubiuser
October 28, 2023 12:10 13s release/v6.0
release/v6.0
October 28, 2023 12:10 13s
Pi-hole v6.0 documentation Check for merge conflicts #489: Pull request #338 synchronize by yubiuser
October 28, 2023 12:04 2m 13s
October 28, 2023 12:04 2m 13s
ProTip! You can narrow down the results and go further in time using created:<2023-10-28 or the other filters available.