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

Fix renderer crash from adblock page(removed stats from adblock webui) (uplift to 1.20.x) #7837

Merged
merged 1 commit into from
Feb 5, 2021
Merged

Fix renderer crash from adblock page(removed stats from adblock webui) (uplift to 1.20.x) #7837

merged 1 commit into from
Feb 5, 2021

Conversation

brave-builds
Copy link
Collaborator

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

Uplift of #7811
fix brave/brave-browser#13775

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 23:08
@brave-builds brave-builds self-assigned this Feb 4, 2021
@brave-builds brave-builds added this to the 1.20.x - Release #2 milestone Feb 4, 2021
@simonhong simonhong self-assigned this Feb 4, 2021
@kjozwiak
Copy link
Member

kjozwiak commented Feb 5, 2021

macOS failed due to s3-upload failing as per https://ci.brave.com/job/pr-brave-browser-pr7811_fix_renderer_crash_from_adblock_page_1.20.x-macos/1/execution/node/250/log/. Definitely not a blocker as it's not related to the PR and everything else passed without any issues.

kjozwiak
kjozwiak approved these changes Feb 5, 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 on Nightly as per #7811 (comment).

@kjozwiak kjozwiak merged commit 52a7f0e into 1.20.x Feb 5, 2021
@kjozwiak kjozwiak deleted the pr7811_fix_renderer_crash_from_adblock_page_1.20.x branch February 5, 2021 06:24
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

@simonhong simonhong

@brave-builds brave-builds

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

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