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

Include web discovery bundles in the brave extension (uplift to 1.31.x) #10209

Merged
merged 2 commits into from
Sep 27, 2021
Merged

Include web discovery bundles in the brave extension (uplift to 1.31.x) #10209

merged 2 commits into from
Sep 27, 2021

Conversation

brave-builds
Copy link
Collaborator

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

Uplift of #9381 and #10229. The latter PR includes a description fix in settings.
Resolves brave/brave-browser#18166

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 review from fmarier and a team as code owners September 22, 2021 19:48
@brave-builds brave-builds requested a review from a team September 22, 2021 19:48
@brave-builds brave-builds self-assigned this Sep 22, 2021
@brave-builds brave-builds added this to the 1.31.x - Beta milestone Sep 22, 2021
fmarier
fmarier approved these changes Sep 22, 2021
View reviewed changes
Copy link
Member

@fmarier fmarier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

License file changes look good to me.

script/brave_license_helper.py
@@ -132,7 +137,7 @@ def AddBraveCredits(prune_paths, special_cases, prune_dirs, additional_paths):

def CheckBraveMissingLicense(target_os, path, error):
if path.startswith('brave'):
if (target_os == 'android'):
if target_os == 'android':
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guido would be proud :)

Copy link
Contributor

@kkuehlz kkuehlz Sep 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol i think pylint did it

Copy link
Collaborator

@remusao remusao Sep 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guido would be proud :)

And the linter happy!

remusao
remusao reviewed Sep 22, 2021
View reviewed changes
DEPS Show resolved Hide resolved
kjozwiak
kjozwiak approved these changes Sep 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.31.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #9381 (comment) & #10229 (comment).

@kjozwiak kjozwiak merged commit 38cebcb into 1.31.x Sep 27, 2021
@kjozwiak kjozwiak deleted the pr9381_humanweb_bundled_extension_1.31.x branch September 27, 2021 02:57
@mkarolin mkarolin mentioned this pull request Oct 6, 2021
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kkuehlz kkuehlz kkuehlz left review comments

@remusao remusao remusao approved these changes

@kjozwiak kjozwiak kjozwiak approved these changes

@fmarier fmarier fmarier approved these changes

Assignees

@brave-builds brave-builds

Labels
None yet
Projects
None yet
Milestone
1.31.x - Release
Development

Successfully merging this pull request may close these issues.
6 participants
@brave-builds @fmarier @remusao @kjozwiak @kkuehlz @brave-browser-releases