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

Issue 7044: Do not import cookies from Chrome and Firefox. (uplift to 1.3.x) #4225

Merged
merged 1 commit into from
Dec 16, 2019
Merged

Issue 7044: Do not import cookies from Chrome and Firefox. (uplift to 1.3.x) #4225

merged 1 commit into from
Dec 16, 2019

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Dec 13, 2019 •
edited by bsclifton
Loading

Uplift of #4121
Fixes brave/brave-browser#7044

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 self-assigned this Dec 13, 2019
@brave-builds brave-builds added this to the 1.3.x - Dev milestone Dec 13, 2019
@bsclifton bsclifton requested review from a team and removed request for bridiver, bbondy, kjozwiak, bsclifton, rebron and srirambv December 13, 2019 06:13
@kjozwiak
Copy link
Member

Restarting macOS due to https://ci.brave.com/job/brave-browser-build-pr/job/pr4121_ie_dont_import_cookies_1.3.x/1/execution/node/698/log/ failing.

Linux also failed due to https://ci.brave.com/job/brave-browser-build-pr/job/pr4121_ie_dont_import_cookies_1.3.x/1/execution/node/494/log/. However, the JSON parsing issue is a known intermittent problem. I'll run Linux again as the PR needs to be rebuilt on macOS either way due to the above error.

@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-windows labels Dec 14, 2019
@kjozwiak kjozwiak mentioned this pull request Dec 14, 2019
Merged
4 tasks
@kjozwiak
Copy link
Member

Restarting Linux due to https://ci.brave.com/job/brave-browser-build-pr/job/pr4121_ie_dont_import_cookies_1.3.x/2/execution/node/403/log/ failing.

@kjozwiak kjozwiak added the CI/skip-macos-x64 Do not run CI builds for macOS x64 label Dec 14, 2019
kjozwiak
kjozwiak approved these changes Dec 16, 2019
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.3.x approved after deliberating with @brave/uplift-approvers. Both CI/Jenkins and CI/Travis passed without any issues. Please make sure that all the correct labels are being used and the associated issue(s) are moved into the correct milestone.

@kjozwiak kjozwiak merged commit 71ce326 into 1.3.x Dec 16, 2019
@kjozwiak kjozwiak deleted the pr4121_ie_dont_import_cookies_1.3.x branch December 16, 2019 16:41
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

@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 CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Milestone
1.3.x - Release
Development

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