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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #2750 from pi-hole/fix/forwarded_history_database Check for merge conflicts #4870: Commit 2bdfce6 pushed by DL6ER
2m 5s development
development
2m 5s
Merge pull request #2626 from pi-hole/new/lua-5.5.0 Check for merge conflicts #4869: Commit b5de2f7 pushed by DL6ER
2m 9s development
development
2m 9s
Merge pull request #2758 from pi-hole/fix/custom_gravity_path_teleporter Check for merge conflicts #4868: Commit 8cbce82 pushed by DL6ER
2m 9s development
development
2m 9s
Merge pull request #2760 from pi-hole/fix/ntp_root_delay Check for merge conflicts #4867: Commit 7632e4b pushed by DL6ER
2m 7s development
development
2m 7s
Fix computation of NTP server's root delay Check for merge conflicts #4866: Commit 178f44e pushed by DL6ER
6s fix/ntp_root_delay
fix/ntp_root_delay
6s
Fix computation of NTP server's root delay Check for merge conflicts #4865: Commit 3ffcee3 pushed by DL6ER
6s fix/ntp_root_delay
fix/ntp_root_delay
6s
Merge branch 'development' into tweak/track_sqlite_memory Check for merge conflicts #4864: Commit 589649d pushed by DL6ER
6s tweak/track_sqlite_memory
tweak/track_sqlite_memory
6s
Acknowledge that gravity.db may be on another path than the hard-code… Check for merge conflicts #4863: Commit c830a48 pushed by DL6ER
6s fix/custom_gravity_path_teleporter
fix/custom_gravity_path_teleporter
6s
Merge pull request #2754 from Erasure5959/development Check for merge conflicts #4862: Commit 567db20 pushed by DL6ER
2m 8s development
development
2m 8s
Harden default Content Security Policy (CSP) Check for merge conflicts #4861: Pull request #2754 synchronize by Erasure5959
7s
7s
Merge pull request #2752 from pi-hole/fix/line-endings Check for merge conflicts #4860: Commit c53bc0b pushed by DL6ER
2m 8s development
development
2m 8s
Fix line endings Check for merge conflicts #4859: Pull request #2752 synchronize by DL6ER
9s
9s
Normalize all line endings to LF using "git add --renormalize ." Check for merge conflicts #4858: Commit 65dc6e4 pushed by DL6ER
8s fix/line-endings
fix/line-endings
8s
Fix line endings Check for merge conflicts #4857: Pull request #2752 synchronize by DL6ER
6s
6s
Normalize all line endings to LF using "git add --renormalize ." Check for merge conflicts #4856: Commit 50c0a07 pushed by DL6ER
7s fix/line-endings
fix/line-endings
7s
Merge pull request #2753 from pi-hole/remove/highlight.js Check for merge conflicts #4855: Commit 02d3204 pushed by DL6ER
2m 9s development
development
2m 9s
Remove highlight.min.js as it is not actually used by the API Check for merge conflicts #4854: Commit dbb002b pushed by DL6ER
9s remove/highlight.js
remove/highlight.js
9s
Normalize all line endings to LF using "git add --renormalize ." Check for merge conflicts #4853: Commit 43aa32d pushed by DL6ER
6s fix/line-endings
fix/line-endings
6s
Merge branch 'development' into new/lua-5.5.0 Check for merge conflicts #4852: Commit 61caea3 pushed by DL6ER
8s new/lua-5.5.0
new/lua-5.5.0
8s
Upgrade embedded Lua to 5.5 Check for merge conflicts #4851: Pull request #2626 synchronize by DL6ER
9s
9s
Merge pull request #2749 from pi-hole/new/hide_connection_errors Check for merge conflicts #4850: Commit a27cd45 pushed by DL6ER
2m 8s development
development
2m 8s
Merge pull request #2749 from pi-hole/new/hide_connection_errors Check for merge conflicts #4849: Commit 9734e11 pushed by github-merge-queue bot
9s gh-readonly-queue/development/pr-2749-8fc724028c449392e17c66db81d4be1ce5a9993c
gh-readonly-queue/development/pr-2749-8fc724028c449392e17c66db81d4be1ce5a9993c
9s
Merge pull request #2748 from pi-hole/dependabot-github_actions-devel… Check for merge conflicts #4848: Commit 8fc7240 pushed by DL6ER
5s development
development
5s
Add missing [forwarded] property in GET /api/history/database Check for merge conflicts #4847: Commit 53c0450 pushed by DL6ER
6s fix/forwarded_history_database
fix/forwarded_history_database
6s
Add missing [forwarded] property in GET /api/history/database Check for merge conflicts #4846: Commit 53c0450 pushed by DL6ER
6m 7s development
development
6m 7s