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
958 workflow runs
958 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump prettier from 3.1.1 to 3.2.4 Check for merge conflicts #1543: Commit d04ddcd pushed by dependabot bot
January 20, 2024 10:54 10s dependabot/npm_and_yarn/devel/prettier-3.2.4
dependabot/npm_and_yarn/devel/prettier-3.2.4
January 20, 2024 10:54 10s
Bump phpstan/phpstan from 1.10.50 to 1.10.56 Check for merge conflicts #1542: Commit d2f7526 pushed by dependabot bot
January 20, 2024 10:33 12s dependabot/composer/devel/phpstan/phpstan-1.10.56
dependabot/composer/devel/phpstan/phpstan-1.10.56
January 20, 2024 10:33 12s
Bump autoprefixer from 10.4.16 to 10.4.17 Check for merge conflicts #1541: Commit a5e10fb pushed by dependabot bot
January 20, 2024 10:26 10s dependabot/npm_and_yarn/development-v6/autoprefixer-10.4.17
dependabot/npm_and_yarn/development-v6/autoprefixer-10.4.17
January 20, 2024 10:26 10s
Bump prettier from 3.2.1 to 3.2.4 Check for merge conflicts #1540: Commit 04ea62b pushed by dependabot bot
January 20, 2024 10:25 11s dependabot/npm_and_yarn/development-v6/prettier-3.2.4
dependabot/npm_and_yarn/development-v6/prettier-3.2.4
January 20, 2024 10:25 11s
Add regex hint to domain/client exclusion box Check for merge conflicts #1539: Commit dee7c2b pushed by yubiuser
January 19, 2024 21:21 12s regex
regex
January 19, 2024 21:21 12s
Fix group editing (#2922) Check for merge conflicts #1538: Commit 0c1b44e pushed by DL6ER
January 17, 2024 18:42 2m 10s development-v6
development-v6
January 17, 2024 18:42 2m 10s
[Typo] Fix typo in checkMessages warning (#2932) Check for merge conflicts #1537: Commit 07b5f26 pushed by yubiuser
January 17, 2024 13:38 2m 13s development-v6
development-v6
January 17, 2024 13:38 2m 13s
[Typo] Fix typo in checkMessages warning Check for merge conflicts #1536: Pull request #2932 synchronize by avano
January 17, 2024 13:36 12s
January 17, 2024 13:36 12s
[Typo] Fix typo in checkMessages warning Check for merge conflicts #1535: Pull request #2932 synchronize by avano
January 17, 2024 13:34 13s
January 17, 2024 13:34 13s
Use replaceAll to ensure all newlines are converted to HTML line brea… Check for merge conflicts #1534: Commit 9f04f7a pushed by DL6ER
January 15, 2024 15:32 2m 13s development-v6
development-v6
January 15, 2024 15:32 2m 13s
Use replaceAll to ensure all newlines are converted to HTML line breaks Check for merge conflicts #1533: Commit bac88f1 pushed by DL6ER
January 14, 2024 16:36 9s fix/replaceAll
fix/replaceAll
January 14, 2024 16:36 9s
Bump prettier from 3.1.1 to 3.2.1 (#2930) Check for merge conflicts #1532: Commit 0c26269 pushed by yubiuser
January 13, 2024 19:42 2m 13s development-v6
development-v6
January 13, 2024 19:42 2m 13s
Bump prettier from 3.1.1 to 3.2.1 Check for merge conflicts #1531: Commit 63a4a67 pushed by dependabot bot
January 13, 2024 10:35 9s dependabot/npm_and_yarn/development-v6/prettier-3.2.1
dependabot/npm_and_yarn/development-v6/prettier-3.2.1
January 13, 2024 10:35 9s
Bump prettier from 3.1.1 to 3.2.1 Check for merge conflicts #1530: Commit bb46b3d pushed by dependabot bot
January 13, 2024 10:11 10s dependabot/npm_and_yarn/devel/prettier-3.2.1
dependabot/npm_and_yarn/devel/prettier-3.2.1
January 13, 2024 10:11 10s
Bump phpstan/phpstan from 1.10.50 to 1.10.55 Check for merge conflicts #1529: Commit e36f5d7 pushed by dependabot bot
January 13, 2024 10:06 12s dependabot/composer/devel/phpstan/phpstan-1.10.55
dependabot/composer/devel/phpstan/phpstan-1.10.55
January 13, 2024 10:06 12s
Check for merge conflicts Check for merge conflicts #1528: by yubiuser
January 11, 2024 20:23 2m 13s development-v6
development-v6
January 11, 2024 20:23 2m 13s
Add query log handling of SPECIAL_DOMAIN Check for merge conflicts #1527: Pull request #2895 synchronize by yubiuser
January 11, 2024 20:07 13s
January 11, 2024 20:07 13s
Apply red background color to special domains in query log Check for merge conflicts #1526: Commit 07aaa44 pushed by yubiuser
January 11, 2024 20:07 13s SPECIAL_DOMAIN
SPECIAL_DOMAIN
January 11, 2024 20:07 13s
Add support for legacy Teleporter archives (#2858) Check for merge conflicts #1525: Commit 3b0359c pushed by PromoFaux
January 11, 2024 08:29 2m 16s development-v6
development-v6
January 11, 2024 08:29 2m 16s
Ensure blocking mode timer is started even when set via a third-party… Check for merge conflicts #1524: Commit fef1def pushed by DL6ER
January 10, 2024 18:33 2m 12s development-v6
development-v6
January 10, 2024 18:33 2m 12s
Explicitly set content encoding (#2927) Check for merge conflicts #1523: Commit 211bd42 pushed by yubiuser
January 8, 2024 20:08 2m 11s development-v6
development-v6
January 8, 2024 20:08 2m 11s
Fix deletion of addresses with spaces in them by avoiding encoding to… Check for merge conflicts #1522: Commit a53086e pushed by DL6ER
January 8, 2024 19:33 11s fix/space-escape
fix/space-escape
January 8, 2024 19:33 11s
Tweak settings level and add changed-only toggle Check for merge conflicts #1521: Pull request #2882 synchronize by DL6ER
January 7, 2024 13:17 14s
January 7, 2024 13:17 14s
Merge branch 'development-v6' into tweak/settings_changed_only Check for merge conflicts #1520: Commit 52991f4 pushed by DL6ER
January 7, 2024 13:17 10s tweak/settings_changed_only
tweak/settings_changed_only
January 7, 2024 13:17 10s
Bump admin-lte from 2.4.18 to 3.2.0 Check for merge conflicts #1519: Pull request #2902 synchronize by dependabot bot
January 6, 2024 11:51 10s
January 6, 2024 11:51 10s
ProTip! You can narrow down the results and go further in time using created:<2024-01-06 or the other filters available.