Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only apply top level domain blocking in aggressive mode (uplift to 1.24.x) #8481

Merged
merged 2 commits into from
Apr 15, 2021
Merged

Only apply top level domain blocking in aggressive mode (uplift to 1.24.x) #8481

merged 2 commits into from
Apr 15, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Apr 8, 2021 •
edited by kjozwiak
Loading

Uplift of #8470 & #8511
Resolves brave/brave-browser#15095 & brave/brave-browser#15242

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from a team April 8, 2021 15:56
@brave-builds brave-builds self-assigned this Apr 8, 2021
@brave-builds brave-builds added this to the 1.24.x - Beta milestone Apr 8, 2021
@kjozwiak
Copy link
Member

Waiting for #8511 to be appended into the following PR. Unfortunately #8470 didn't fix the original issue re: only allowing top level domain blocking when Aggressive mode is selected via Brave Shields.

@kjozwiak
Copy link
Member

Restarting macOS as test-browser timed out as per https://ci.brave.com/job/pr-brave-browser-pr8470_mpilgrim_domain_block_aggressive_1.24.x-macos/2/execution/node/241/log/.

Restarting iOS as build timed out as per https://ci.brave.com/job/pr-brave-browser-pr8470_mpilgrim_domain_block_aggressive_1.24.x-ios/2/execution/node/147/log/.

kjozwiak
kjozwiak approved these changes Apr 15, 2021
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.24.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #8511 (comment).

@kjozwiak kjozwiak merged commit e2a70a1 into 1.24.x Apr 15, 2021
@kjozwiak kjozwiak deleted the pr8470_mpilgrim_domain_block_aggressive_1.24.x branch April 15, 2021 03:33
kylehickinson pushed a commit that referenced this pull request Jan 4, 2024
@nuo-xu
Fix #8481: Race condition in NFT tab when user hide/unhide NFT before…
917f116 
… balance or metadata is fetched (#8486)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@brave-builds brave-builds

Labels
None yet
Projects
None yet
Milestone
1.24.x - Release
Development

Successfully merging this pull request may close these issues.
4 participants
@brave-builds @kjozwiak @brave-browser-releases @pilgrim-brave