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

Fixed top toolbar with disabled bottom toolbar and no rewards icon (uplift to 1.8.x) #5421

Merged
merged 1 commit into from
May 5, 2020
Merged

Fixed top toolbar with disabled bottom toolbar and no rewards icon (uplift to 1.8.x) #5421

merged 1 commit into from
May 5, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Apr 29, 2020 •
edited by kjozwiak
Loading

Uplift of #5412
Fixes brave/brave-browser#9040

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 Apr 29, 2020
@brave-builds brave-builds added this to the 1.8.x - Release milestone Apr 29, 2020
@bsclifton bsclifton requested review from a team and removed request for bbondy, kjozwiak, bsclifton, rebron and srirambv May 4, 2020 06:27
@kjozwiak
Copy link
Member

kjozwiak commented May 4, 2020

Restarting on all platforms as the b-b job never started and ended up timing out.

@samartnik samartnik force-pushed the pr5412_android_fixed_disabled_bottom_toolbar_no_rewards_1.8.x branch from 41940c5 to 5517e7c Compare May 4, 2020 17:19
@samartnik samartnik 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 May 4, 2020
@kjozwiak
Copy link
Member

kjozwiak commented May 5, 2020

Looks like Travis failed TEST_SUITE=test-security due to the yargs-parser package which is a known issue and not blocking uplift.

kjozwiak
kjozwiak approved these changes May 5, 2020
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.8.x approved after deliberating with @brave/uplift-approvers. QA verified the PR on the latest Nightly as per #5412 (comment). Ensured that the issue has been moved into the appropriate milestone.

@kjozwiak kjozwiak merged commit 6ad0f61 into 1.8.x May 5, 2020
@kjozwiak kjozwiak deleted the pr5412_android_fixed_disabled_bottom_toolbar_no_rewards_1.8.x branch May 5, 2020 14:55
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-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.8.x - Release
Development

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