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

Show dialog when Brave tries to import Safari data w/o disk permission (uplift to 1.5.x) #4731

Merged
merged 4 commits into from
Mar 4, 2020
Merged

Show dialog when Brave tries to import Safari data w/o disk permission (uplift to 1.5.x) #4731

merged 4 commits into from
Mar 4, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Feb 25, 2020 •
edited by kjozwiak
Loading

Uplift of #4530
Fixes brave/brave-browser#2710

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 Feb 25, 2020
@brave-builds brave-builds added this to the 1.5.x - Beta milestone Feb 25, 2020
@simonhong simonhong self-assigned this Feb 25, 2020
@simonhong simonhong added CI/skip-android Do not run CI builds for Android CI/skip-linux CI/skip-ios Do not run CI builds for iOS and removed CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Feb 25, 2020
@kjozwiak
Copy link
Member

Waiting for an answer re: #4530 (comment).

@kjozwiak
Copy link
Member

Waiting for brave/brave-browser#8447 to be fixed before uplifting. CCing @rebron @bsclifton

@simonhong simonhong added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Feb 28, 2020
@bsclifton
Copy link
Member

@kjozwiak text updated; CI running now 👍

@kjozwiak
Copy link
Member

Waiting on #4530 (comment).

@bsclifton bsclifton requested review from a team and removed request for rebron and srirambv March 3, 2020 16:24
@bsclifton
Merge pull request #4815 from brave/bsc-fix-safari-import-text
3221ed9 
Fixed wording on Safari import dialog
@bsclifton
Copy link
Member

Text updated to remove and History (basically cherry-picked #4815)

@kjozwiak
Copy link
Member

kjozwiak commented Mar 4, 2020

Waiting for a new Nightly so we can check the new changes re: removing History from the string.

@kjozwiak
Copy link
Member

kjozwiak commented Mar 4, 2020

Nightly available with the above fix via https://github.com/brave/brave-browser/releases/tag/v1.7.39. Removing the PR/Blocked label.

kjozwiak
kjozwiak approved these changes Mar 4, 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.5.x approved after deliberating with @brave/uplift-approvers. Both CI/Jenkins and CI/Travis passed without any issues after several restarts. QA has also run through the PR on Nightly via #4530 (comment) and #4530 (comment).

Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit 4f09229 into 1.5.x Mar 4, 2020
@kjozwiak kjozwiak deleted the pr4530_issue_2710_1.5.x branch March 4, 2020 05:33
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
CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Milestone
1.5.x - Release
Development

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