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

Deprecate bap modal android (uplift to 1.21.x) #7831

Merged
merged 1 commit into from
Feb 16, 2021
Merged

Deprecate bap modal android (uplift to 1.21.x) #7831

merged 1 commit into from
Feb 16, 2021

Conversation

brave-builds
Copy link
Collaborator

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

Uplift of #7817
Resolves brave/brave-browser#13798

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 a review from a team February 4, 2021 19:58
@brave-builds brave-builds self-assigned this Feb 4, 2021
@brave-builds brave-builds added this to the 1.21.x - Beta milestone Feb 4, 2021
@kjozwiak
Copy link
Member

kjozwiak commented Feb 15, 2021 •
edited
Loading

test-browser failed on Win x64 due to AdBlockServiceTest.CosmeticFilteringProtect1p failing as per https://ci.brave.com/job/pr-brave-browser-pr7817_deprecate_bap_modal_android_1.21.x-windows/1/execution/node/234/log/. However, this is a known intermittent failure as per brave/brave-browser#13887 and was fixed.

17:32:50  1 test failed:
17:32:50      AdBlockServiceTest.CosmeticFilteringProtect1p (../../brave/browser/brave_shields/ad_block_service_browsertest.cc:922)

kjozwiak
kjozwiak approved these changes Feb 16, 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. QA has verified the PR on Nightly as per #7817 (comment) & #7817 (comment).

@kjozwiak kjozwiak merged commit ba9e332 into 1.21.x Feb 16, 2021
@kjozwiak kjozwiak deleted the pr7817_deprecate_bap_modal_android_1.21.x branch February 16, 2021 21:31
bsclifton added a commit that referenced this pull request Feb 26, 2021
@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.
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
None yet
Projects
None yet
Milestone
1.21.x - Release
Development

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