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

Issues 2482: Update the ad-block repo version #1098

Merged
merged 1 commit into from
Dec 14, 2018
Merged

Issues 2482: Update the ad-block repo version #1098

merged 1 commit into from
Dec 14, 2018

Conversation

iefremov
Copy link
Contributor

@iefremov iefremov commented Dec 14, 2018

Fix brave/brave-browser#2482

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
  • 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

@iefremov iefremov requested a review from bbondy December 14, 2018 12:10
@iefremov
Copy link
Contributor Author

@bbondy Had to also merge this commit to ad-block to fix compilation
brave-experiments/ad-block@366274d

@bbondy bbondy merged commit 7ccb451 into master Dec 14, 2018
bbondy added a commit that referenced this pull request Dec 14, 2018
Issues 2482: Update the ad-block repo version
@bbondy
Copy link
Member

bbondy commented Dec 14, 2018

master: 7ccb451
0.60.x: 2b41313

@kjozwiak
Copy link
Member

@iefremov @bbondy uplift request to 0.59.x approved after deliberating with @srirambv & @rebron 👍 Please add/remove all required labels and ensure that the associated issue is moved to the correct milestone.

bbondy added a commit that referenced this pull request Dec 14, 2018
Issues 2482: Update the ad-block repo version
@bbondy
Copy link
Member

bbondy commented Dec 14, 2018

0.59.x: 8ea1f34

@bbondy bbondy added this to the 0.59.x - Beta milestone Jan 14, 2019
@bsclifton bsclifton deleted the ad_blok_bump branch January 24, 2019 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Images blocked when device language is set to Japanese
3 participants