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.

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

migrate android toolbar settings (uplift to 1.7.x) #4971

Merged
merged 1 commit into from
Mar 18, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Mar 17, 2020

Uplift of #4970

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 Mar 17, 2020
@brave-builds brave-builds added this to the 1.7.x - Beta milestone Mar 17, 2020
@SergeyZhukovsky SergeyZhukovsky added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Mar 17, 2020
@kjozwiak
Copy link
Member

Travis is failing TEST_SUITE=test-security due to the minimist npm package being vulnerable. It's a known issue as per brave/brave-browser#8722 and doesn't block the PR from being uplifted.

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.7.x approved after deliberating with @brave/uplift-approvers. As per #4971 (comment), Travis failed due to TEST_SUITE=test-security because of minimist which is a known issue and highlighted via brave/brave-browser#8722.

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 86789ff into 1.7.x Mar 18, 2020
@kjozwiak kjozwiak deleted the pr4970_android_toolbar_migration_1.7.x branch March 18, 2020 05:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

4 participants