Skip to content

Fix Allow Scripts Once logic for embedded scripts and iframes. (uplift to 1.35.x) #12058

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
Merged
merged 1 commit into from
Jan 30, 2022
Merged

Fix Allow Scripts Once logic for embedded scripts and iframes. (uplift to 1.35.x) #12058

merged 1 commit into from
Jan 30, 2022

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jan 28, 2022 •
edited by kjozwiak
Loading

Uplift of #12023
Resolves brave/brave-browser#20744

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 January 28, 2022 22:47
@brave-builds brave-builds self-assigned this Jan 28, 2022
@brave-builds brave-builds added this to the 1.35.x - Release milestone Jan 28, 2022
@goodov
Copy link
Member

goodov commented Jan 29, 2022 •
edited
Loading

BraveShieldsAPIBrowserTest.AllowScriptsOnceIframe failed in MacOS build, I restarted it. The test is flaky and also frequently fails in builds without this change (but succeeds on retry). For example here: https://ci.brave.com/job/brave-browser-build-macos-x64/4662/consoleText
I made an issue to track this brave/brave-browser#20785
It's safe to merge the uplift, because the step we're fixing here is working fine, only a test precondition fails.

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

@kjozwiak kjozwiak merged commit f673d15 into 1.35.x Jan 30, 2022
@kjozwiak kjozwiak deleted the pr12023_issues/20503-allowallonce_1.35.x branch January 30, 2022 06:12
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.35.x - Release
Development

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