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

Update search engines (uplift to 1.27.x) #9428

Merged
merged 3 commits into from
Jul 22, 2021
Merged

Update search engines (uplift to 1.27.x) #9428

merged 3 commits into from
Jul 22, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jul 14, 2021 •
edited by kjozwiak
Loading

Uplift of #9397
Fixes brave/brave-browser#16825
Fixes brave/brave-browser#16870

Uplift of #9458
Fixes brave/brave-browser#16965

Uplift of #9486
Fixes brave/brave-browser#16950

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 as a code owner July 14, 2021 05:59
@brave-builds brave-builds requested a review from a team July 14, 2021 05:59
@brave-builds brave-builds self-assigned this Jul 14, 2021
@brave-builds brave-builds added this to the 1.27.x - Beta milestone Jul 14, 2021
@bsclifton bsclifton removed the request for review from a team July 14, 2021 06:08
@LaurenWags
Copy link
Member

Labelling PR/Blocked pending https://bravesoftware.slack.com/archives/C0816QH3R/p1626332061032100

@bsclifton
Copy link
Member

bsclifton commented Jul 20, 2021 •
edited
Loading

Note to @brave/uplift-approvers: unfortunately, this change caused brave/brave-browser#16950

We should block this PR and cherry-pick the fix from #9486 (when it's reviewed and approved)

@bsclifton bsclifton mentioned this pull request Jul 20, 2021
Closed
7 tasks
@simonhong
Copy link
Member

#9486 is cherry-picked here

@bsclifton
Copy link
Member

bsclifton commented Jul 21, 2021 •
edited
Loading

Removing the blocked label! This is ready for consideration 😄

brave-browser-releases and others added 3 commits July 21, 2021 09:36
@brave-browser-releases @bsclifton
Uplift of #9397 (squashed) to beta
2a8a401
@deeppandya @bsclifton
Update DDG Se (#9458)
c378501 
* Update DDG Se

* Fix broken Android tests

Co-authored-by: Brian Clifton <[email protected]>
@simonhong @bsclifton
Merge pull request #9486 from brave/fix_tor_window_crash
92b62ab 
Set proper DDG config as a default alternate SE except QWANT region in Tor
@bsclifton bsclifton force-pushed the pr9397_bsc-search-updates_1.27.x branch from 56e7991 to 92b62ab Compare July 21, 2021 16:36
@kjozwiak
Copy link
Member

post-init failed due to several pylint error/warnings as per https://ci.brave.com/job/pr-brave-browser-pr9397_bsc-search-updates_1.27.x-post-init/4/pylint. However, we the above doesn't block uplift.

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

@kjozwiak kjozwiak merged commit 70d5b26 into 1.27.x Jul 22, 2021
@kjozwiak kjozwiak deleted the pr9397_bsc-search-updates_1.27.x branch July 22, 2021 03:33
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.27.x - Release
Development

Successfully merging this pull request may close these issues.
7 participants
@brave-builds @LaurenWags @bsclifton @simonhong @kjozwiak @brave-browser-releases @deeppandya