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

Toned down interstitials for top-level blocking. (uplift to 1.24.x) #8611

Merged
merged 1 commit into from
Apr 27, 2021
Merged

Toned down interstitials for top-level blocking. (uplift to 1.24.x) #8611

merged 1 commit into from
Apr 27, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Apr 22, 2021 •
edited by kjozwiak
Loading

Fixes brave/brave-browser#15433
Uplift of #8603

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • 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 April 22, 2021 17:21
@brave-builds brave-builds self-assigned this Apr 22, 2021
@brave-builds brave-builds added this to the 1.24.x - Beta milestone Apr 22, 2021
@mkarolin mkarolin force-pushed the pr8603_maxk-fix-domain-block-interstitial_1.24.x branch from a02a706 to 4e0b17a Compare April 26, 2021 19:49
@kjozwiak
Copy link
Member

Restarting macOS as build failed as per https://ci.brave.com/job/pr-brave-browser-pr8603_maxk-fix-domain-block-interstitial_1.24.x-macos/3/execution/node/166/log/.

19:38:26  FAILED: obj/ppapi/cpp/objects/image_data.o

kjozwiak
kjozwiak approved these changes Apr 27, 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.24.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #8603 (comment).

@kjozwiak kjozwiak merged commit 489a2c7 into 1.24.x Apr 27, 2021
@kjozwiak kjozwiak deleted the pr8603_maxk-fix-domain-block-interstitial_1.24.x branch April 27, 2021 17:00
kylehickinson pushed a commit that referenced this pull request Jan 8, 2024
@Brandon-T
Fix #8565: Re-enable Screen-Time. (#8611)
0400f6c
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.24.x - Release
Development

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