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.

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

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 commented Mar 16, 2019

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

Related PR: brave/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 force-pushed the force-block-option branch 7 times, most recently from ae5488d to d86fd1c Mar 18, 2019
@bbondy bbondy marked this pull request as ready for review Mar 19, 2019
@bbondy bbondy requested a review from emerick Mar 19, 2019
Copy link
Contributor

emerick left a comment

LGTM

@bbondy bbondy force-pushed the force-block-option branch from d86fd1c to 82b071c Mar 19, 2019
@bbondy bbondy force-pushed the force-block-option branch from 82b071c to 24b7d47 Mar 19, 2019
@bbondy bbondy merged commit 7c13b83 into master Mar 19, 2019
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/jenkins/pr-head This commit cannot be built
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
bbondy added a commit that referenced this pull request Mar 19, 2019
Add an explicitcancel ad-block filter option
bbondy added a commit that referenced this pull request Mar 19, 2019
Add an explicitcancel ad-block filter option
@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
Add an explicitcancel ad-block filter option
@mihaiplesa mihaiplesa deleted the force-block-option branch May 13, 2019
fmarier pushed a commit that referenced this pull request Oct 29, 2019
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
Projects
None yet
2 participants
You can’t perform that action at this time.