Skip to content

Actions: pi-hole/web

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
1,146 workflow run results
1,146 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump phpstan/phpstan from 1.11.4 to 1.11.5 Check for merge conflicts #1891: Commit 7feb55c pushed by dependabot bot
June 22, 2024 10:23 10s dependabot/composer/devel/phpstan/phpstan-1.11.5
dependabot/composer/devel/phpstan/phpstan-1.11.5
June 22, 2024 10:23 10s
Show CLI sessions property Check for merge conflicts #1890: Commit 76a7248 pushed by DL6ER
June 20, 2024 18:05 16s new/cli_pw
new/cli_pw
June 20, 2024 18:05 16s
Show warning if user already set an application password Check for merge conflicts #1889: Pull request #3048 synchronize by rdwebdesign
June 17, 2024 18:46 12s
June 17, 2024 18:46 12s
Use only one button class per button to fix button text color Check for merge conflicts #1888: Commit 94b49ce pushed by rdwebdesign
June 17, 2024 18:46 12s tweak/warn_apppw
tweak/warn_apppw
June 17, 2024 18:46 12s
Bump braces in the npm_and_yarn group across 1 directory Check for merge conflicts #1887: Commit 0229f30 pushed by dependabot bot
June 16, 2024 11:42 11s dependabot/npm_and_yarn/npm_and_yarn-5134b82be1
dependabot/npm_and_yarn/npm_and_yarn-5134b82be1
June 16, 2024 11:42 11s
Update settings-api.lp Check for merge conflicts #1885: Commit d7ca2da pushed by DL6ER
June 16, 2024 05:54 10s tweak/warn_apppw
tweak/warn_apppw
June 16, 2024 05:54 10s
Show warning if user already set an application password Check for merge conflicts #1886: Pull request #3048 synchronize by DL6ER
June 16, 2024 05:54 10s
June 16, 2024 05:54 10s
Show warning if user already set an application password Check for merge conflicts #1884: Pull request #3048 synchronize by DL6ER
June 16, 2024 05:51 9s
June 16, 2024 05:51 9s
Add explicit confirmation when trying to replace existing password Check for merge conflicts #1883: Commit 513b700 pushed by DL6ER
June 16, 2024 05:50 12s tweak/warn_apppw
tweak/warn_apppw
June 16, 2024 05:50 12s
Show warning if user already set an application password Check for merge conflicts #1882: Pull request #3048 synchronize by DL6ER
June 16, 2024 05:24 10s
June 16, 2024 05:24 10s
Add explicit confirmation when trying to replace existing password Check for merge conflicts #1881: Commit b4fe5a6 pushed by DL6ER
June 16, 2024 05:24 9s tweak/warn_apppw
tweak/warn_apppw
June 16, 2024 05:24 9s
Development v6 Check for merge conflicts #1880: Pull request #3019 synchronize by yubiuser
June 15, 2024 12:28 10s
June 15, 2024 12:28 10s
Bump eslint-plugin-compat from 4.2.0 to 5.0.0 (#3050) Check for merge conflicts #1879: Commit 103bfed pushed by yubiuser
June 15, 2024 12:28 2m 11s development-v6
development-v6
June 15, 2024 12:28 2m 11s
Bump eslint-plugin-compat from 4.2.0 to 5.0.0 (#3054) Check for merge conflicts #1878: Commit b96c741 pushed by yubiuser
June 15, 2024 12:27 2m 13s devel
devel
June 15, 2024 12:27 2m 13s
Bump eslint-plugin-compat from 4.2.0 to 5.0.0 Check for merge conflicts #1877: Pull request #3054 synchronize by dependabot bot
June 15, 2024 12:23 11s
June 15, 2024 12:23 11s
Bump eslint-plugin-compat from 4.2.0 to 5.0.0 Check for merge conflicts #1876: Commit a5c1554 pushed by dependabot bot
June 15, 2024 12:23 12s dependabot/npm_and_yarn/devel/eslint-plugin-compat-5.0.0
dependabot/npm_and_yarn/devel/eslint-plugin-compat-5.0.0
June 15, 2024 12:23 12s
Bump prettier from 3.3.1 to 3.3.2 (#3053) Check for merge conflicts #1875: Commit dcd5fe3 pushed by yubiuser
June 15, 2024 12:22 2m 10s devel
devel
June 15, 2024 12:22 2m 10s
Development v6 Check for merge conflicts #1874: Pull request #3019 synchronize by yubiuser
June 15, 2024 12:20 18s
June 15, 2024 12:20 18s
Bump actions/checkout from 4.1.6 to 4.1.7 (#3052) Check for merge conflicts #1873: Commit aa76ace pushed by yubiuser
June 15, 2024 12:20 2m 15s development-v6
development-v6
June 15, 2024 12:20 2m 15s
Bump actions/checkout from 4.1.6 to 4.1.7 (#3051) Check for merge conflicts #1872: Commit 96f437c pushed by yubiuser
June 15, 2024 12:18 2m 12s devel
devel
June 15, 2024 12:18 2m 12s
Bump eslint-plugin-compat from 4.2.0 to 5.0.0 Check for merge conflicts #1871: Pull request #3050 synchronize by dependabot bot
June 15, 2024 11:26 10s
June 15, 2024 11:26 10s
Bump eslint-plugin-compat from 4.2.0 to 5.0.0 Check for merge conflicts #1870: Commit 96cd1aa pushed by dependabot bot
June 15, 2024 11:26 10s dependabot/npm_and_yarn/development-v6/eslint-plugin-compat-5.0.0
dependabot/npm_and_yarn/development-v6/eslint-plugin-compat-5.0.0
June 15, 2024 11:26 10s
Development v6 Check for merge conflicts #1869: Pull request #3019 synchronize by yubiuser
June 15, 2024 11:26 10s
June 15, 2024 11:26 10s
Bump prettier from 3.3.1 to 3.3.2 (#3049) Check for merge conflicts #1868: Commit 26f4945 pushed by yubiuser
June 15, 2024 11:26 2m 11s development-v6
development-v6
June 15, 2024 11:26 2m 11s
Bump eslint-plugin-compat from 4.2.0 to 5.0.0 Check for merge conflicts #1867: Commit e35b1d6 pushed by dependabot bot
June 15, 2024 10:42 10s dependabot/npm_and_yarn/devel/eslint-plugin-compat-5.0.0
dependabot/npm_and_yarn/devel/eslint-plugin-compat-5.0.0
June 15, 2024 10:42 10s