Skip to content

/ brave-core

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

Add social blocking options #1968

Merged
merged 2 commits into from Mar 18, 2019
Merged

Add social blocking options #1968

merged 2 commits into from Mar 18, 2019

Conversation

@bbondy
Copy link
Member

bbondy commented Mar 15, 2019

Uplift request for: #1818

Fix brave/brave-browser#3489
Fix brave/brave-browser#3534

Related PRs:
brave/adblock-lists#54
brave/ad-block#192
@bbondy
Merge pull request #1818 from brave/social-blocking-options
Loading status checks…
6d2bda3 
Add social blocking options
@bbondy bbondy requested a review from brave/uplift-approvers Mar 15, 2019
@NejcZdovc NejcZdovc added this to the 0.63.x - Dev milestone Mar 15, 2019
@bbondy bbondy changed the title Merge pull request #1818 from brave/social-blocking-options Add social blocking options Mar 15, 2019
@kjozwiak
kjozwiak reviewed Mar 15, 2019
View changes
Copy link
Member

kjozwiak left a comment

Uplift to 0.63.x approved after deliberating with @rebron. Please ensure that all associated issues are moved into the correct milestone 👍

@bbondy can you get a 0.62.x PR going as well?
@bbondy bbondy self-assigned this Mar 15, 2019
@bbondy
Merge pull request #1987 from brave/social-blocking-proxy-fix
Loading status checks…
1a95e65 
Fix SocialBlockingBrowserProxyImpl class name
@bbondy bbondy merged commit 41991e5 into 0.63.x Mar 18, 2019
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/jenkins/pr-head This commit is being built
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@mihaiplesa mihaiplesa deleted the social-blocking-options-0.63.x branch May 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak

Assignees

@bbondy bbondy

Labels
None yet
Projects
None yet
Milestone
  0.63.x - Release
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@bbondy @kjozwiak @NejcZdovc
You can’t perform that action at this time.