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 start Web Discovery Project in incognito and Tor windows (uplift to 1.31.x) #10675

Merged
merged 1 commit into from
Oct 26, 2021
Merged

Don't start Web Discovery Project in incognito and Tor windows (uplift to 1.31.x) #10675

merged 1 commit into from
Oct 26, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Oct 25, 2021 •
edited by kjozwiak
Loading

Uplift of #10670
Resolves brave/brave-browser#18885
Resolves brave/brave-browser#18958

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 October 25, 2021 14:47
@brave-builds brave-builds self-assigned this Oct 25, 2021
@brave-builds brave-builds added this to the 1.31.x - Release #2 milestone Oct 25, 2021
@remusao remusao self-assigned this Oct 25, 2021
@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Oct 25, 2021
@kjozwiak
Copy link
Member

The above uplift will need to be rebased to include #10667 which fixes the issue that macOS ran into. #10667 was uplifted into 1.32.x & 1.31.x via #10671 & #10676.

Added the CI/Skip label as the other OS's passed without any issues. We'll just need to re-run macOS.

@kjozwiak
Copy link
Member

Adding PR/Blocked till the above is rebased and macOS passes CI.

@remusao remusao force-pushed the pr10670_disable-wdp-incognito-tor_1.31.x branch from 3db03e3 to 37c1732 Compare October 25, 2021 20:56
kjozwiak
kjozwiak approved these changes Oct 26, 2021
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.31.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #10670 (comment).

@kjozwiak kjozwiak merged commit b35e3f5 into 1.31.x Oct 26, 2021
@kjozwiak kjozwiak deleted the pr10670_disable-wdp-incognito-tor_1.31.x branch October 26, 2021 06:31
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

@remusao remusao

@brave-builds brave-builds

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.31.x - Release #2
Development

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