feature: integrate gaba/PhishingController #6568
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bitpshr
requested review from
danfinlay,
brunobar79,
whymarrh,
jennypollack and
frankiebee
tmashuang
reviewed
May 7, 2019
tmashuang
reviewed
May 7, 2019
|
Nice, past the lint, but since we bumped two packages this morning, #6581, fix the conflicts. |
bitpshr
force-pushed
the
feature/gaba-phishing-controller
branch
from
16aefa4 to
77d3bc2
Compare
tmashuang
approved these changes
May 10, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request integrates
gaba/PhishingControllerand removes the oldBlacklistController.Resolves #6537
A blocked site:
Reference: http://electrum.mx
The same site, bypassed:
Reference: http://electrum.mx