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

Add shields settings (uplift to 1.27.x) #9293

Merged
merged 1 commit into from
Jul 6, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jun 30, 2021

Uplift of #9240
Resolves brave/brave-browser#16300
Resolves brave/brave-browser#16299

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from a team June 30, 2021 19:07
@brave-builds brave-builds self-assigned this Jun 30, 2021
@brave-builds brave-builds added this to the 1.27.x - Beta milestone Jun 30, 2021
@kjozwiak
Copy link
Member

kjozwiak commented Jul 2, 2021

test-browser failed on macOS as per https://ci.brave.com/job/pr-brave-browser-pr9240_add-shields-settings_1.27.x-macos/1/testReport/. However, these are known intermittent failures as per brave/brave-browser#13883 & brave/brave-browser#13884 and are unrelated to this specific PR.

macos-x64 / test-browser / RewardsContributionBrowserTest.SplitProcessOneTimeTip
macos-x64 / test-browser / RewardsContributionBrowserTest.SplitProcessorAutoContribution

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.27.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #9240 (comment).

@kjozwiak kjozwiak merged commit c915d5b into 1.27.x Jul 6, 2021
@kjozwiak kjozwiak deleted the pr9240_add-shields-settings_1.27.x branch July 6, 2021 02:20
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