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

Revert bap modal changes 1.21.x #8088

Merged
merged 7 commits into from
Feb 26, 2021
Merged

Revert bap modal changes 1.21.x #8088

merged 7 commits into from
Feb 26, 2021

Conversation

bsclifton
Copy link
Member

Reverting the following work

Android

Desktop

moving the following issues to 1.22:

Android

Desktop

@bsclifton
Revert "Merge pull request #7989 from brave/pr7985_bap_modal_update_a…
d464263 
…ndroid_1.21.x"

This reverts commit 90d478c, reversing
changes made to 0f5ace7.
@bsclifton
Revert "Merge pull request #7831 from brave/pr7817_deprecate_bap_moda…
8a984d2 
…l_android_1.21.x"

This reverts commit ba9e332, reversing
changes made to 37d0e1c.
@bsclifton
Revert "Merge pull request #7983 from brave/maxk-more-ja-l10n"
2815082 
This reverts commit 55cf299, reversing
changes made to f25d284.
@bsclifton
Revert "Merge pull request #7949 from brave/maxk-ja-l10n-update"
dafaea2 
This reverts commit 96e3378, reversing
changes made to 4ef5188.
@bsclifton
Revert "Merge pull request #7945 from brave/pr7935_ksmith-bap-ui-cras…
706d689 
…h_1.21.x"

This reverts commit 64f63d7, reversing
changes made to 96e3378.
@bsclifton
Revert "Merge pull request #7933 from brave/pr7924_ksmith-fix-bap-cut…
d7a6695 
…off_1.21.x"

This reverts commit 4ef5188, reversing
changes made to 0814d47.
@bsclifton
Revert "Merge pull request #7698 from brave/ksmith-bap-deprecation-ui"
2234229 
This reverts commit 4a268d3, reversing
changes made to 5b0f721.
@bsclifton bsclifton added this to the 1.21.x - Release milestone Feb 26, 2021
@bsclifton bsclifton requested a review from a team February 26, 2021 16:47
@bsclifton bsclifton self-assigned this Feb 26, 2021
@bsclifton bsclifton changed the base branch from master to 1.21.x February 26, 2021 16:47
@bsclifton bsclifton removed the request for review from samartnik February 26, 2021 16:48
@kjozwiak
Copy link
Member

Double checked and made sure we're reverting the same PRs as per #8001.

@kjozwiak
Copy link
Member

post-install failed audit-deps due to a known issue as per https://ci.brave.com/job/pr-brave-browser-bsc-revert-bap-modal-changes-1.21.x-post-init/1/execution/node/145/log/.

kjozwiak
kjozwiak approved these changes Feb 26, 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.21.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit a7f53dc into 1.21.x Feb 26, 2021
@kjozwiak kjozwiak deleted the bsc-revert-bap-modal-changes-1.21.x branch February 26, 2021 20:16
This was referenced Feb 26, 2021
Merged
Closed
Closed
Closed
Closed
Closed
Merged
Closed
Closed
Closed
Closed
Merged
@bsclifton bsclifton mentioned this pull request Mar 9, 2021
Merged
7 tasks
bsclifton added a commit that referenced this pull request Mar 10, 2021
@bsclifton
Revert "Merge pull request #8088 from brave/bsc-revert-bap-modal-chan…
e8252cf 
…ges-1.21.x"

This reverts commit a7f53dc, reversing
changes made to 4f0b4b2.
bsclifton added a commit that referenced this pull request Mar 10, 2021
@bsclifton
Revert "Merge pull request #8088 from brave/bsc-revert-bap-modal-chan…
a52f7fd 
…ges-1.21.x"

This reverts commit a7f53dc, reversing
changes made to 4f0b4b2.
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

@bsclifton bsclifton

Labels
None yet
Projects
None yet
Milestone
1.21.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@bsclifton @kjozwiak