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

Refactor integration ghostery whitelisting with Cliqz modules #23

Merged
merged 2 commits into from Apr 5, 2018

Conversation

@sammacbeth
Copy link
Contributor

@sammacbeth sammacbeth commented Apr 3, 2018

  • Have you followed the guidelines in CONTRIBUTING.md?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you added an explanation of what your changes do?
  • Does your submission pass tests?
  • Did you lint your code prior to submission?

This PR implements whitelisting of urls in the anti-tracking and adblocker pipelines based on the ghosteryWhitelisted signal. I've also refactored the registration of this whitelisting function to use actions, which will be more robust to changes in the browser-core package.

This required some further changes on the browser-core side, so I have updated the dependency to a build based off 1.26.1.

@sammacbeth sammacbeth requested review from zarembsky and ghostery/ghostery as code owners Apr 3, 2018
@jsignanini
Copy link
Member

@jsignanini jsignanini commented Apr 3, 2018

@sammacbeth looks like some check failed, could you please take a look? Maybe some unit test needs updating.

@sammacbeth sammacbeth force-pushed the sammacbeth:cliqz-whitelisting-actions branch 2 times, most recently from a8ae3dc to 61de9e2 Apr 3, 2018
Copy link
Contributor

@zarembsky zarembsky left a comment

Looks OK, though with this change Ghostery code is getting tied more closely to Cliqz code. A change in pipeline steps in Cliqz side might require changes on Ghostery side.

@sammacbeth
Copy link
Contributor Author

@sammacbeth sammacbeth commented Apr 5, 2018

@zarembsky Pipeline steps should not change often on the cliqz side. Also, in comparison to the previous method, this one will fail with an error if an incompatible change occurs.

sammacbeth added 2 commits Mar 26, 2018
…locker from Ghostery side
@sammacbeth sammacbeth force-pushed the sammacbeth:cliqz-whitelisting-actions branch from 61de9e2 to 05ceff9 Apr 5, 2018
@jsignanini jsignanini merged commit c431b0e into ghostery:develop Apr 5, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants