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.

Sign up for GitHub

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

Jump to bottom

Move default rules to content settings #622

Merged
merged 10 commits into from
Oct 16, 2018
Merged

Move default rules to content settings #622

merged 10 commits into from
Oct 16, 2018

Conversation

pilgrim-brave
Copy link
Contributor

@pilgrim-brave pilgrim-brave commented Oct 12, 2018 •
edited by yrliou
Loading

Fix brave/brave-browser#1381
Fix brave/brave-browser#1524

Submitter Checklist:

  • 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).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@bbondy bbondy changed the title WIP Move default rules to content settings WIP: Move default rules to content settings Oct 14, 2018
@yrliou yrliou mentioned this pull request Oct 15, 2018
Closed
@bbondy bbondy changed the title WIP: Move default rules to content settings Move default rules to content settings Oct 15, 2018
@yrliou yrliou mentioned this pull request Oct 15, 2018
Merged
@yrliou yrliou force-pushed the defaults_to_content_settings branch from 5b63104 to ac15096 Compare October 15, 2018 23:04
@yrliou
Copy link
Member

yrliou commented Oct 15, 2018 •
edited
Loading

PR lgtm, just pushed few small fixes and rebased on master because of conflict on DEPS

@yrliou yrliou merged commit d62d279 into master Oct 16, 2018
yrliou added a commit that referenced this pull request Oct 16, 2018
@yrliou
Merge pull request #622 from brave/defaults_to_content_settings
60c3b53 
Move default rules to content settings
yrliou added a commit that referenced this pull request Oct 16, 2018
@yrliou
Merge pull request #622 from brave/defaults_to_content_settings
33c6033 
Move default rules to content settings
@yrliou
Copy link
Member

yrliou commented Oct 16, 2018

master: d62d279
0.55.x: 60c3b53
0.56.x: 33c6033

@yrliou yrliou mentioned this pull request Oct 16, 2018
Closed
@yrliou yrliou deleted the defaults_to_content_settings branch October 16, 2018 20:11
@simonhong simonhong mentioned this pull request Dec 14, 2018
Merged
18 tasks
@bbondy bbondy added this to the 0.55.x - Release milestone Jan 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bbondy bbondy bbondy approved these changes

Assignees

@pilgrim-brave pilgrim-brave

Labels
None yet
Projects
None yet
Milestone
0.55.x - Release
3 participants
@pilgrim-brave @yrliou @bbondy