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.

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

Fix for domain blocking iframes (uplift to 1.23.x) #8412

Merged
merged 1 commit into from
Apr 6, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Apr 1, 2021

Uplift of #8389
Resolves brave/brave-browser#14826

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 1, 2021 15:56
@brave-builds brave-builds self-assigned this Apr 1, 2021
@brave-builds brave-builds added this to the 1.23.x - Beta milestone Apr 1, 2021
@kjozwiak
Copy link
Member

kjozwiak commented Apr 6, 2021

post-init failed due to audit_deps as per https://ci.brave.com/job/pr-brave-browser-pr8389_mpilgrim_main_frame_1.23.x-post-init/1/execution/node/144/log/ which is a known failure/warning and unrelated to this specific PR.

test-browser failed on macOS as per https://ci.brave.com/job/pr-brave-browser-pr8389_mpilgrim_main_frame_1.23.x-macos/1/execution/node/241/log/ & https://ci.brave.com/job/pr-brave-browser-pr8389_mpilgrim_main_frame_1.23.x-macos/1/execution/node/244/log/. However, this is a known failure and unrelated to this specific PR.

14:05:43  5 tests crashed:
14:05:43      BraveStatsUpdaterBrowserTest.StatsUpdaterMigration (../../brave/browser/brave_stats/brave_stats_updater_browsertest.cc:275)
14:05:43      BraveStatsUpdaterBrowserTest.StatsUpdaterSetsFirstCheckPreference (../../brave/browser/brave_stats/brave_stats_updater_browsertest.cc:154)
14:05:43      BraveStatsUpdaterBrowserTest.StatsUpdaterStartupPingWithDefaultReferralCode (../../brave/browser/brave_stats/brave_stats_updater_browsertest.cc:229)
14:05:43      BraveStatsUpdaterBrowserTest.StatsUpdaterStartupPingWithReferralCode (../../brave/browser/brave_stats/brave_stats_updater_browsertest.cc:327)
14:05:43      BraveStatsUpdaterBrowserTest.StatsUpdaterThresholdSetsFirstCheckPreference (../../brave/browser/brave_stats/brave_stats_updater_browsertest.cc:191)

macOS failed due to test-browser as per https://ci.brave.com/job/pr-brave-browser-pr8389_mpilgrim_main_frame_1.23.x-linux/1/execution/node/241/log/ & https://ci.brave.com/job/pr-brave-browser-pr8389_mpilgrim_main_frame_1.23.x-linux/1/execution/node/244/log/. However, this is a known failure and unrelated to this specific PR.

13:33:53  7 tests crashed:
13:33:53      BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion072WithRewardsAndAdsEnabled_ForSupportedLocale_ForNewlySupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled (../../brave/components/brave_ads/browser/ads_service_browsertest.cc:1000)
13:33:53      BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion072WithRewardsAndAdsEnabled_ForSupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeEnabled (../../brave/components/brave_ads/browser/ads_service_browsertest.cc:1000)
13:33:53      BraveStatsUpdaterBrowserTest.StatsUpdaterMigration (../../brave/browser/brave_stats/brave_stats_updater_browsertest.cc:275)
13:33:53      BraveStatsUpdaterBrowserTest.StatsUpdaterSetsFirstCheckPreference (../../brave/browser/brave_stats/brave_stats_updater_browsertest.cc:154)
13:33:53      BraveStatsUpdaterBrowserTest.StatsUpdaterStartupPingWithDefaultReferralCode (../../brave/browser/brave_stats/brave_stats_updater_browsertest.cc:229)
13:33:53      BraveStatsUpdaterBrowserTest.StatsUpdaterStartupPingWithReferralCode (../../brave/browser/brave_stats/brave_stats_updater_browsertest.cc:327)
13:33:53      BraveStatsUpdaterBrowserTest.StatsUpdaterThresholdSetsFirstCheckPreference (../../brave/browser/brave_stats/brave_stats_updater_browsertest.cc:191)

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.23.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per brave/brave-browser#14826 (comment).

@kjozwiak kjozwiak merged commit 0afaed2 into 1.23.x Apr 6, 2021
@kjozwiak kjozwiak deleted the pr8389_mpilgrim_main_frame_1.23.x branch April 6, 2021 17:48
kylehickinson pushed a commit that referenced this pull request Jan 4, 2024
…s auto-locked (#8413)

Dismiss NFT Discovery and NFT Removal popups when wallet is auto-locked
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants