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

3rd party cookie registry domains (uplift to 1.9.x) #5410

Merged
merged 1 commit into from
May 4, 2020
Merged

3rd party cookie registry domains (uplift to 1.9.x) #5410

merged 1 commit into from
May 4, 2020

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Apr 28, 2020 •
edited by kjozwiak
Loading

This uplift excludes changes to browser/net/brave_network_delegate_browsertest.cc due to merge conflicts

Uplift of #5390
Fixes brave/brave-browser#9489

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.

@bridiver @bsclifton
Merge pull request #5390 from brave/3rd-party-cookie-registry-domains
7ffaedf 
3rd party cookie registry domains

This excludes changes to `browser/net/brave_network_delegate_browsertest.cc`
@bsclifton bsclifton added this to the 1.9.x - Beta milestone Apr 28, 2020
@bsclifton bsclifton requested a review from a team April 28, 2020 16:44
@bsclifton bsclifton self-assigned this Apr 28, 2020
@bsclifton bsclifton removed the request for review from iefremov April 28, 2020 16:44
@kjozwiak
Copy link
Member

Looks like macOS failed due to xUnit failing to publish test-unit results as per https://ci.brave.com/job/brave-browser-build-pr/job/3rd-party-cookie-registry-domains-1.9.x/1/execution/node/663/log/. This is a known issue and doesn't block uplift.

kjozwiak
kjozwiak approved these changes May 4, 2020
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Uplift into 1.9.x approved after deliberating with @brave/uplift-approvers. QA verified the PR on Nightly as per #5390 (comment) and #5390 (comment). Ensured that the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit dc4e2d2 into 1.9.x May 4, 2020
@kjozwiak kjozwiak deleted the 3rd-party-cookie-registry-domains-1.9.x branch May 4, 2020 13:47
@bsclifton bsclifton mentioned this pull request May 27, 2020
Merged
4 tasks
bsclifton added a commit that referenced this pull request May 28, 2020
@bsclifton
Updated failing test:
f0f8538 
- test failure was caused by bad merge in #5410
- manually updated test with proper logic
- other tests had to be updated because 1.9 doesn't have #5318
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

@bsclifton bsclifton

Labels
None yet
Projects
None yet
Milestone
1.9.x - Release
Development

Successfully merging this pull request may close these issues.
3 participants
@bsclifton @kjozwiak @bridiver