Skip to content
This repository has been archived by the owner. It is now read-only.

Only check third party url when not in main frame #7924

Merged
merged 1 commit into from Mar 28, 2017
Merged

Conversation

@darkdh
Copy link
Member

darkdh commented Mar 27, 2017

fix #7916

Auditors: @bbondy, @bsclifton

Test Plan:

  • Make sure automated tests are passing

    • npm run test -- --grep=adBlockUtil
  • Make sure you don't see ads on YouTube.

  • Make sure http://downloadme.org/ will be reported as malicious site

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

  • Ran git rebase -i to squash commits (if needed).

fix #7916

Auditors: @bbondy, @bsclifton

Test Plan:
- Make sure automated tests are passing
  - `npm run test -- --grep=adBlockUtil`
- Make sure you don't see ads on YouTube.
- Make sure `http://downloadme.org/` will be reported as malicious site
@darkdh darkdh self-assigned this Mar 27, 2017
@darkdh darkdh requested review from bbondy and bsclifton Mar 27, 2017
@darkdh darkdh added this to the 0.14.0 milestone Mar 27, 2017
@bbondy
Copy link
Member

bbondy commented Mar 28, 2017

++

@bbondy bbondy merged commit 25eb598 into brave:master Mar 28, 2017
0 of 2 checks passed
0 of 2 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
@luixxiul luixxiul removed the request for review from bbondy Mar 28, 2017
@bsclifton

This comment has been minimized.

Copy link

bsclifton commented on fc24493 Mar 28, 2017

++ 😄

Just a heads up- I believe this commit is causing linting errors with Standard 9.0 (which aren't present in Standard 8). Once brave#7817 is accepted, we'll start noticing these locally (on pre-commit hook)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants
You can’t perform that action at this time.