Skip to content

chore: merge main into wm/patches for uBOL 2026.705.2152#30

Draft
gaelhelle-vp with Copilot wants to merge 10 commits into
wm/patchesfrom
copilot/merge-main-into-wm-patches-another-one
Draft

chore: merge main into wm/patches for uBOL 2026.705.2152#30
gaelhelle-vp with Copilot wants to merge 10 commits into
wm/patchesfrom
copilot/merge-main-into-wm-patches-another-one

Conversation

Copilot AI commented Jul 10, 2026 •
edited
Loading

Copy link
Copy Markdown

This PR integrates the latest upstream-synced main into wm/patches to carry forward the 2026.705.2152 uBOL release line. The branch now includes upstream code/ruleset updates while preserving patch-branch continuity via a merge commit.

  • Upstream sync integration

    • Merged origin/main into the patch branch lineage used by this PR.
    • Brought in upstream release updates (including generated ruleset/state changes) required for 2026.705.2152.

  • Conflict resolution outcome

    • Merge completed cleanly under ort strategy; no manual conflict edits were needed.
    • Final delta is captured as a merge commit over the existing wm/patches history.

  • Resulting merge shape

    • Maintains explicit two-parent history for traceable upstream integration.
git show --no-patch --pretty=raw f3268661
# parent 1: previous wm/patches-based HEAD
# parent 2: origin/main (upstream-synced)

Raymond Hill (gorhill) and others added 9 commits July 1, 2026 15:51
@gorhill
Make Firefox dev build auto-update
b34f36b
@gorhill
Update submodules
483da05
@gorhill
Update changelog
e46bdd2
@gorhill
[workflow] Update uBOLite MV3 package files for 2026.705.2152
bf73b82 
Files changed:
M	chromium/_locales/cs/messages.json
M	chromium/_locales/de/messages.json
M	chromium/_locales/en_GB/messages.json
M	chromium/_locales/fr/messages.json
M	chromium/_locales/nl/messages.json
M	chromium/_locales/ro/messages.json
M	chromium/_locales/ru/messages.json
M	chromium/js/jsonpath.js
M	chromium/js/ruleset-manager.js
M	chromium/js/ubo-parser.js
M	chromium/log.txt
M	chromium/manifest.json
M	chromium/rulesets/generic-details.json
M	chromium/rulesets/main/adguard-mobile.json
M	chromium/rulesets/main/adguard-spyware-url.json
M	chromium/rulesets/main/alb-0.json
M	chromium/rulesets/main/annoyances-ai.json
M	chromium/rulesets/main/annoyances-cookies.json
M	chromium/rulesets/main/annoyances-notifications.json
M	chromium/rulesets/main/annoyances-others.json
M	chromium/rulesets/main/annoyances-overlays.json
M	chromium/rulesets/main/annoyances-social.json
M	chromium/rulesets/main/annoyances-widgets.json
M	chromium/rulesets/main/ara-0.json
M	chromium/rulesets/main/bgr-0.json
M	chromium/rulesets/main/block-lan.json
M	chromium/rulesets/main/chn-0.json
M	chromium/rulesets/main/cze-0.json
M	chromium/rulesets/main/deu-0.json
M	chromium/rulesets/main/dpollock-0.json
M	chromium/rulesets/main/easylist.json
M	chromium/rulesets/main/easyprivacy.json
M	chromium/rulesets/main/est-0.json
M	chromium/rulesets/main/fin-0.json
M	chromium/rulesets/main/fra-0.json
M	chromium/rulesets/main/grc-0.json
M	chromium/rulesets/main/hrv-0.json
M	chromium/rulesets/main/hun-0.json
M	chromium/rulesets/main/idn-0.json
M	chromium/rulesets/main/ind-0.json
M	chromium/rulesets/main/irn-0.json
M	chromium/rulesets/main/isr-0.json
M	chromium/rulesets/main/ita-0.json
M	chromium/rulesets/main/jpn-1.json
M	chromium/rulesets/main/kor-1.json
M	chromium/rulesets/main/ltu-0.json
M	chromium/rulesets/main/lva-0.json
M	chromium/rulesets/main/mkd-0.json
M	chromium/rulesets/main/nld-0.json
M	chromium/rulesets/main/nor-0.json
M	chromium/rulesets/main/pgl.json
M	chromium/rulesets/main/pol-0.json
M	chromium/rulesets/main/pol-3.json
M	chromium/rulesets/main/rou-1.json
M	chromium/rulesets/main/rus-0.json
M	chromium/rulesets/main/rus-1.json
M	chromium/rulesets/main/spa-0.json
M	chromium/rulesets/main/spa-1.json
M	chromium/rulesets/main/svn-0.json
M	chromium/rulesets/main/swe-1.json
M	chromium/rulesets/main/tha-0.json
M	chromium/rulesets/main/tur-0.json
M	chromium/rulesets/main/ublock-badware.json
M	chromium/rulesets/main/ublock-filters.json
M	chromium/rulesets/main/ukr-0.json
M	chromium/rulesets/main/urlhaus-full.json
M	chromium/rulesets/main/vie-1.json
M	chromium/rulesets/regex/chn-0.json
M	chromium/rulesets/regex/rou-1.json
M	chromium/rulesets/regex/rus-0.json
M	chromium/rulesets/regex/ublock-filters.json
M	chromium/rulesets/ruleset-details.json
M	chromium/rulesets/scripting/generic/annoyances-notifications.js
M	chromium/rulesets/scripting/generic/ara-0.js
M	chromium/rulesets/scripting/generic/chn-0.js
M	chromium/rulesets/scripting/generic/easylist.js
M	chromium/rulesets/scripting/generic/fra-0.js
M	chromium/rulesets/scripting/generic/idn-0.js
M	chromium/rulesets/scripting/generic/jpn-1.js
M	chromium/rulesets/scripting/generic/rou-1.js
M	chromium/rulesets/scripting/generic/rus-0.js
M	chromium/rulesets/scripting/generic/tur-0.js
M	chromium/rulesets/scripting/generic/ublock-badware.js
M	chromium/rulesets/scripting/generic/ublock-filters.js
A	chromium/rulesets/scripting/popup/annoyances-overlays.js
M	chromium/rulesets/scripting/popup/ara-0.js
M	chromium/rulesets/scripting/popup/chn-0.js
M	chromium/rulesets/scripting/popup/easylist.js
M	chromium/rulesets/scripting/popup/fra-0.js
M	chromium/rulesets/scripting/popup/idn-0.js
M	chromium/rulesets/scripting/popup/irn-0.js
M	chromium/rulesets/scripting/popup/nor-0.js
M	chromium/rulesets/scripting/popup/rus-0.js
M	chromium/rulesets/scripting/popup/spa-1.js
M	chromium/rulesets/scripting/popup/swe-1.js
M	chromium/rulesets/scripting/popup/tur-0.js
M	chromium/rulesets/scripting/popup/ublock-badware.js
M	chromium/rulesets/scripting/popup/ublock-filters.js
M	chromium/rulesets/scripting/popup/ukr-0.js
M	chromium/rulesets/scripting/scriptlet/isolated/adguard-mobile.js
M	chromium/rulesets/scripting/scriptlet/isolated/annoyances-cookies.js
M	chromium/rulesets/scripting/scriptlet/isolated/annoyances-others.js
M	chromium/rulesets/scripting/scriptlet/isolated/annoyances-overlays.js
M	chromium/rulesets/scripting/scriptlet/isolated/rus-0.js
M	chromium/rulesets/scripting/scriptlet/isolated/tur-0.js
A	chromium/rulesets/scripting/scriptlet/isolated/ublock-badware.js
M	chromium/rulesets/scripting/scriptlet/isolated/ublock-filters.js
M	chromium/rulesets/scripting/scriptlet/isolated/vie-1.js
M	chromium/rulesets/scripting/scriptlet/main/adguard-mobile.js
M	chromium/rulesets/scripting/scriptlet/main/annoyances-cookies.js
M	chromium/rulesets/scripting/scriptlet/main/annoyances-overlays.js
M	chromium/rulesets/scripting/scriptlet/main/chn-0.js
M	chromium/rulesets/scripting/scriptlet/main/easyprivacy.js
M	chromium/rulesets/scripting/scriptlet/main/fra-0.js
M	chromium/rulesets/scripting/scriptlet/main/idn-0.js
M	chromium/rulesets/scripting/scriptlet/main/jpn-1.js
M	chromium/rulesets/scripting/scriptlet/main/nld-0.js
M	chromium/rulesets/scripting/scriptlet/main/rou-1.js
M	chromium/rulesets/scripting/scriptlet/main/spa-1.js
M	chromium/rulesets/scripting/scriptlet/main/swe-1.js
M	chromium/rulesets/scripting/scriptlet/main/tur-0.js
M	chromium/rulesets/scripting/scriptlet/main/ublock-experimental.js
M	chromium/rulesets/scripting/scriptlet/main/ublock-filters.js
M	chromium/rulesets/scripting/scriptlet/main/ubol-tests.js
M	chromium/rulesets/scripting/scriptlet/main/vie-1.js
M	chromium/rulesets/scripting/specific/adguard-mobile.json
M	chromium/rulesets/scripting/specific/annoyances-ai.json
M	chromium/rulesets/scripting/specific/annoyances-cookies.json
M	chromium/rulesets/scripting/specific/annoyances-notifications.json
M	chromium/rulesets/scripting/specific/annoyances-others.json
M	chromium/rulesets/scripting/specific/annoyances-overlays.json
M	chromium/rulesets/scripting/specific/annoyances-social.json
M	chromium/rulesets/scripting/specific/ara-0.json
M	chromium/rulesets/scripting/specific/chn-0.json
M	chromium/rulesets/scripting/specific/deu-0.json
M	chromium/rulesets/scripting/specific/easylist.json
M	chromium/rulesets/scripting/specific/fin-0.json
M	chromium/rulesets/scripting/specific/fra-0.json
M	chromium/rulesets/scripting/specific/grc-0.json
M	chromium/rulesets/scripting/specific/hun-0.json
M	chromium/rulesets/scripting/specific/idn-0.json
M	chromium/rulesets/scripting/specific/ind-0.json
M	chromium/rulesets/scripting/specific/isr-0.json
M	chromium/rulesets/scripting/specific/jpn-1.json
M	chromium/rulesets/scripting/specific/kor-1.json
M	chromium/rulesets/scripting/specific/nld-0.json
M	chromium/rulesets/scripting/specific/nor-0.json
M	chromium/rulesets/scripting/specific/rou-1.json
M	chromium/rulesets/scripting/specific/rus-0.json
M	chromium/rulesets/scripting/specific/spa-0.json
M	chromium/rulesets/scripting/specific/spa-1.json
M	chromium/rulesets/scripting/specific/swe-1.json
M	chromium/rulesets/scripting/specific/tur-0.json
M	chromium/rulesets/scripting/specific/ublock-filters.json
M	chromium/rulesets/scripting/specific/ukr-0.json
M	chromium/rulesets/scripting/specific/vie-1.json
M	chromium/rulesets/scriptlet-details.json
M	chromium/rulesets/strictblock/alb-0.json
M	chromium/rulesets/strictblock/annoyances-ai.json
M	chromium/rulesets/strictblock/annoyances-overlays.json
M	chromium/rulesets/strictblock/annoyances-widgets.json
M	chromium/rulesets/strictblock/chn-0.json
M	chromium/rulesets/strictblock/dpollock-0.json
M	chromium/rulesets/strictblock/easylist.json
M	chromium/rulesets/strictblock/easyprivacy.json
M	chromium/rulesets/strictblock/est-0.json
M	chromium/rulesets/strictblock/fra-0.json
M	chromium/rulesets/strictblock/irn-0.json
M	chromium/rulesets/strictblock/jpn-1.json
M	chromium/rulesets/strictblock/kor-1.json
M	chromium/rulesets/strictblock/nor-0.json
M	chromium/rulesets/strictblock/pgl.json
M	chromium/rulesets/strictblock/pol-3.json
M	chromium/rulesets/strictblock/rou-1.json
M	chromium/rulesets/strictblock/spa-1.json
M	chromium/rulesets/strictblock/swe-1.json
M	chromium/rulesets/strictblock/tur-0.json
M	chromium/rulesets/strictblock/ublock-badware.json
M	chromium/rulesets/strictblock/ublock-filters.json
M	chromium/rulesets/strictblock/ukr-0.json
M	chromium/rulesets/strictblock/urlhaus-full.json
M	chromium/rulesets/strictblock/vie-1.json
M	chromium/rulesets/urlskip/ublock-filters.json
@gorhill
Update changelog
b261dd0
@gorhill
Update submodules
592990a
@gorhill
Update changelog
3962827
@gorhill
Make Firefox dev build auto-update
c36da63
Initial plan
1f54abc
Copilot AI linked an issue Jul 10, 2026 that may be closed by this pull request
Merge main into wm/patches (upstream sync + conflict resolution), ubol release 2026.705.2152 #29
Open
Copilot AI changed the title [WIP] Merge main into wm/patches for upstream sync and conflict resolution chore: merge main into wm/patches for uBOL 2026.705.2152 Jul 10, 2026
Copilot AI requested a review from gaelhelle-vp July 10, 2026 00:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gaelhelle-vp gaelhelle-vp Awaiting requested review from gaelhelle-vp

Assignees

@gaelhelle-vp gaelhelle-vp

Copilot code review Copilot

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Merge main into wm/patches (upstream sync + conflict resolution), ubol release 2026.705.2152

3 participants

@gaelhelle-vp @gorhill