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

Uses context URL loader for a search fallback (uplift to 1.24.x) #8572

Merged
merged 4 commits into from
Apr 22, 2021

Conversation

brave-builds
Copy link
Collaborator

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

Uplift of #8568
Uplift of #8582
Resolves brave/brave-browser#15399
Resolves brave/brave-browser#15377

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 20, 2021 17:12
@brave-builds brave-builds self-assigned this Apr 20, 2021
@brave-builds brave-builds added this to the 1.24.x - Beta milestone Apr 20, 2021
@kjozwiak
Copy link
Member

test-browser failed on macOS as per https://ci.brave.com/job/pr-brave-browser-pr8568_context_url_loader_search_1.24.x-macos/4/failure-cause-scan-log/. However, these are known intermittent failures and unrelated to this specific PR.

2021-04-22 01:11 Found failed test case: UpgradePath/PreferencesForVersion069WithRewardsAndAdsEnabled_ForSupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeEnabled
2021-04-22 01:11 Found failed test case: UpgradePath/PreferencesForVersion12WithRewardsAndAdsEnabled_ForSupportedLocale_ForNewlySupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled

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.

@kjozwiak kjozwiak merged commit b3ba30b into 1.24.x Apr 22, 2021
@kjozwiak kjozwiak deleted the pr8568_context_url_loader_search_1.24.x branch April 22, 2021 07:02
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.

4 participants