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

Update BAP UI (uplift to 1.20.x) #7798

Merged
merged 4 commits into from
Feb 15, 2021
Merged

Update BAP UI (uplift to 1.20.x) #7798

merged 4 commits into from
Feb 15, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Feb 3, 2021 •
edited by kjozwiak
Loading

Uplift of #7698
Resolves brave/brave-browser#13701

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 requested review from tmancey and a team as code owners February 3, 2021 16:32
@brave-builds brave-builds requested review from marshall, emerick and a team and removed request for a team February 3, 2021 16:32
@brave-builds brave-builds self-assigned this Feb 3, 2021
@brave-builds brave-builds added this to the 1.20.x - Beta milestone Feb 3, 2021
@kjozwiak kjozwiak modified the milestones: 1.20.x - Release, 1.20.x - Release #2, 1.20.x - Release #3 Feb 4, 2021
@zenparsing zenparsing force-pushed the pr7698_ksmith-bap-deprecation-ui_1.20.x branch from 4d78588 to 73c8d21 Compare February 12, 2021 19:26
@kjozwiak kjozwiak removed the request for review from marshall February 12, 2021 23:18
@kjozwiak
Copy link
Member

Restarting iOS due to build failing as per https://ci.brave.com/job/pr-brave-browser-pr7698_ksmith-bap-deprecation-ui_1.20.x-ios/2/execution/node/145/log/

18:33:11  FAILED: obj/ios/chrome/browser/ui/browser_view/browser_view/browser_view_controller.o

Restarting macOS due to build failing as per https://ci.brave.com/job/pr-brave-browser-pr7698_ksmith-bap-deprecation-ui_1.20.x-macos/2/execution/node/162/log/

18:33:21  FAILED: obj/third_party/blink/renderer/bindings/modules/v8/libbindings_modules_impl.a

kjozwiak
kjozwiak approved these changes Feb 15, 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.20.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR as per brave/brave-browser#14092 (comment), brave/brave-browser#14110 (comment) and brave/brave-browser#14108 (comment).

@kjozwiak kjozwiak merged commit 850f811 into 1.20.x Feb 15, 2021
@kjozwiak kjozwiak deleted the pr7698_ksmith-bap-deprecation-ui_1.20.x branch February 15, 2021 05:12
bsclifton added a commit that referenced this pull request Feb 19, 2021
@bsclifton
Revert "Merge pull request #7798 from brave/pr7698_ksmith-bap-depreca…
2d696fc 
…tion-ui_1.20.x"

This reverts commit 850f811, reversing
changes made to 94b0001.
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

@tmancey tmancey Awaiting requested review from tmancey tmancey is a code owner

@emerick emerick Awaiting requested review from emerick

Assignees

@brave-builds brave-builds

Labels
None yet
Projects
None yet
Milestone
1.20.x - Release #2
Development

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