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

allow first party subdomains when blocking 3rd-party cookies to match… (uplift to 1.9.x) #5329

Merged
merged 1 commit into from
Apr 27, 2020
Merged

allow first party subdomains when blocking 3rd-party cookies to match… (uplift to 1.9.x) #5329

merged 1 commit into from
Apr 27, 2020

Conversation

bsclifton
Copy link
Member

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

Uplift of #5318
Fixes brave/brave-browser#9337

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.

@bsclifton bsclifton added this to the 1.9.x - Beta milestone Apr 22, 2020
@bsclifton bsclifton requested a review from a team April 22, 2020 23:58
@bsclifton bsclifton requested a review from iefremov as a code owner April 22, 2020 23:58
@bsclifton bsclifton self-assigned this Apr 22, 2020
@bsclifton
Copy link
Member Author

Failed on Linux, macOS, and Windows. Going to restart for those platforms

@bsclifton bsclifton added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS labels Apr 23, 2020
@bridiver @bsclifton
Merge pull request #5318 from /issues/9337
8ade0fd 
allow first party subdomains when blocking 3rd-party cookies to match…
@bsclifton
Copy link
Member Author

Restarted CI after brave/brave-browser#9431 was merged 😄

@kjozwiak
Copy link
Member

QA verified #5318 on Nightly via desktop as per #5318 (comment).

However, it doesn't appear to be fixed on Android as per #5318 (comment), #5318 (comment) and #5318 (comment). The Android issue will be addressed in another issue once @jumde takes a look and creates the issue.

kjozwiak
kjozwiak approved these changes Apr 27, 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.9.x approved after deliberating with @brave/uplift-approvers. Please make sure that all the correct labels are used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit f4f3444 into 1.9.x Apr 27, 2020
@kjozwiak kjozwiak deleted the issue-9337-1.9.x branch April 27, 2020 17:49
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

@iefremov iefremov Awaiting requested review from iefremov iefremov is a code owner

Assignees

@bsclifton bsclifton

Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS
Projects
None yet
Milestone
1.9.x - Release
Development

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