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

Don't use CONTENT_SETTING_DEFAULT for FP setting (uplift to 1.11.x) #5927

Merged
merged 1 commit into from
Jun 30, 2020
Merged

Don't use CONTENT_SETTING_DEFAULT for FP setting (uplift to 1.11.x) #5927

merged 1 commit into from
Jun 30, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jun 24, 2020 •
edited by kjozwiak
Loading

Uplift of #5879
Resolves brave/brave-browser#10285

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • 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 24, 2020 01:13
@brave-builds brave-builds self-assigned this Jun 24, 2020
@brave-builds brave-builds added this to the 1.11.x - Beta milestone Jun 24, 2020
@simonhong simonhong self-assigned this Jun 24, 2020
@simonhong
Copy link
Member

Only test-install step was failed - https://ci.brave.com/job/pr-brave-browser-pr5879_fp_v2_settings_1.11.x/1/execution/node/688/log/

@kjozwiak
Copy link
Member

Only test-install step was failed - https://ci.brave.com/job/pr-brave-browser-pr5879_fp_v2_settings_1.11.x/1/execution/node/688/log/

Just some more context, this happened on Win x64. As per the above, all other platforms passed. The above is an intermittent error and doesn't block uplift.

kjozwiak
kjozwiak approved these changes Jun 30, 2020
View reviewed changes
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.11.x approved after deliberating with @brave/uplift-approvers. QA has also verified the STR on Nightly as per #5879.

@kjozwiak kjozwiak merged commit 94e3ed1 into 1.11.x Jun 30, 2020
@kjozwiak kjozwiak deleted the pr5879_fp_v2_settings_1.11.x branch June 30, 2020 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@simonhong simonhong

@brave-builds brave-builds

Labels
None yet
Projects
None yet
Milestone
1.11.x - Release #1
Development

Successfully merging this pull request may close these issues.
4 participants
@brave-builds @simonhong @kjozwiak @brave-browser-releases