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

Disable domain blocking via feature flag #8507

Merged
merged 2 commits into from
Apr 13, 2021
Merged

Conversation

pilgrim-brave
Copy link
Contributor

@pilgrim-brave pilgrim-brave commented Apr 12, 2021

Resolves brave/brave-browser#15149

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@kjozwiak kjozwiak requested review from a team, yrliou and bridiver April 12, 2021 16:24
@kjozwiak kjozwiak added this to the 1.23.x - Release milestone Apr 12, 2021
@@ -237,6 +238,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
offline_pages::kPrefetchingOfflinePagesFeature.name,
translate::kTranslate.name,
#endif
brave_shields::features::kBraveDomainBlock.name,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

app/brave_main_delegate_browsertest.cc is usually updated at the same time when we modifying this.

@kjozwiak
Copy link
Member

Adding @brave/uplift-approvers approval. @pilgrim-brave just heads up, usually PRs need a ++ from @brave/uplift-approvers to be uplifted into BETA or Release. 👍 We needed this one either way so it would have been approved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants