Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

feature: integrate gaba/PhishingController #6568

Merged
merged 1 commit into from
May 10, 2019

Conversation

bitpshr
Copy link
Contributor

@bitpshr bitpshr commented May 6, 2019

This pull request integrates gaba/PhishingController and removes the old BlacklistController.

Resolves #6537

A blocked site:

Reference: http://electrum.mx

blocked

The same site, bypassed:

Reference: http://electrum.mx

bypassed

@tmashuang
Copy link
Contributor

Nice, past the lint, but since we bumped two packages this morning, #6581, fix the conflicts.

@bitpshr bitpshr force-pushed the feature/gaba-phishing-controller branch from 16aefa4 to 77d3bc2 Compare May 8, 2019 21:57
@bitpshr bitpshr requested a review from tmashuang May 8, 2019 21:58
@metamaskbot
Copy link
Collaborator

Builds ready [77d3bc2]: chrome, firefox, edge, opera

@tmashuang tmashuang merged commit 08e8fb2 into develop May 10, 2019
@bitpshr bitpshr deleted the feature/gaba-phishing-controller branch May 10, 2019 21:51
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GABA - PhishingController
3 participants