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

Modifies certain Safety Check and Safe Browsing strings (1.15.x). #6750

Merged
merged 1 commit into from
Oct 2, 2020

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Oct 1, 2020

Fixes brave/brave-browser#11345
Uplift from #6699

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

Modifies certain Safety Check and Safe Browsing strings.
@mkarolin mkarolin added this to the 1.15.x - Release #1 milestone Oct 1, 2020
@mkarolin mkarolin requested a review from a team October 1, 2020 21:21
@mkarolin mkarolin requested a review from bridiver as a code owner October 1, 2020 21:21
@mkarolin mkarolin self-assigned this Oct 1, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Oct 2, 2020

Restarting macOS via https://ci.brave.com/job/pr-brave-browser-maxk-fix-safe-browsing-text-1.15.x-macos/2/ using WIPE_WORKSPACE due to init failing as per https://ci.brave.com/job/pr-brave-browser-maxk-fix-safe-browsing-text-1.15.x-macos/1/execution/node/104/log/.

17:40:40  Error: Command 'vpython src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --num_threads=4 --bucket chromium-binary-patching/zucchini_testdata --recursive -d src/components/zucchini' returned non-zero exit status 1 in /Users/jenkins/jenkins/workspace/pr-brave-browser-maxk-fix-safe-browsing-text-1.15.x-macos
17:40:40  Hook 'vpython src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --num_threads=4 --bucket chromium-binary-patching/zucchini_testdata --recursive -d src/components/zucchini' took 13.04 secs

@mkarolin
Copy link
Collaborator Author

mkarolin commented Oct 2, 2020

Restarted macOS with SKIP_INIT due to

#include "brave/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom-shared.h"
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1 error generated.

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

@kjozwiak kjozwiak merged commit 71b21c6 into 1.15.x Oct 2, 2020
@kjozwiak kjozwiak deleted the maxk-fix-safe-browsing-text-1.15.x branch October 2, 2020 05:43
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.

2 participants