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

Add an explicitcancel ad-block filter option #1981

Merged
merged 3 commits into from
Mar 19, 2019
Merged

Add an explicitcancel ad-block filter option #1981

merged 3 commits into from
Mar 19, 2019

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Mar 16, 2019 •
edited
Loading

Fix brave/brave-browser#3749
Fix brave/brave-browser#2286
Fix brave/brave-browser#2931

Related PR: brave-experiments/ad-block#197

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Verified that all lint errors/warnings are resolved (npm run lint)
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@bbondy bbondy self-assigned this Mar 16, 2019
@bbondy bbondy mentioned this pull request Mar 16, 2019
Merged
@bbondy bbondy force-pushed the force-block-option branch 7 times, most recently from ae5488d to d86fd1c Compare March 19, 2019 00:13
@bbondy bbondy marked this pull request as ready for review March 19, 2019 00:33
@bbondy bbondy requested a review from emerick March 19, 2019 00:33
emerick
emerick previously approved these changes Mar 19, 2019
View reviewed changes
Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

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

LGTM

@bbondy bbondy merged commit 7c13b83 into master Mar 19, 2019
bbondy added a commit that referenced this pull request Mar 19, 2019
@bbondy
Merge pull request #1981 from brave/force-block-option
447ed0c 
Add an explicitcancel ad-block filter option
@bbondy bbondy mentioned this pull request Mar 19, 2019
Closed
bbondy added a commit that referenced this pull request Mar 19, 2019
@bbondy
Merge pull request #1981 from brave/force-block-option
452515a 
Add an explicitcancel ad-block filter option
@bbondy bbondy mentioned this pull request Mar 19, 2019
Merged
@bbondy bbondy added this to the 0.64.x - Dev milestone Mar 31, 2019
bbondy added a commit that referenced this pull request Apr 4, 2019
@bbondy
Merge pull request #1981 from brave/force-block-option
f051019 
Add an explicitcancel ad-block filter option
@mihaiplesa mihaiplesa deleted the force-block-option branch May 13, 2019 10:54
fmarier pushed a commit that referenced this pull request Oct 29, 2019
@bbondy
Merge pull request #2140 from adriandgr/patch-1
a959de3 
Resolves #1981: silence curl download progress in piped command to add key
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emerick emerick emerick left review comments

Assignees

@bbondy bbondy

Labels
None yet
Projects
None yet
Milestone
0.64.x - Release
2 participants
@bbondy @emerick