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

Include shield content settings into cookie rules (uplift to 0.70.x) #3704

Merged
merged 1 commit into from
Oct 16, 2019

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Oct 15, 2019

Uplift of #3690
Fixes brave/brave-browser#6464

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds self-assigned this Oct 15, 2019
@brave-builds brave-builds added this to the 0.70.x - Beta milestone Oct 15, 2019
@bsclifton bsclifton requested review from a team and removed request for bbondy, kjozwiak, iefremov, bsclifton, rebron and srirambv October 15, 2019 18:25
@kjozwiak
Copy link
Member

Restarting on iOS as npm run audit_deps failed as per https://staging.ci.brave.com/job/brave-browser-build-pr/job/pr3690_ie_cookie_fix_0.70.x/1/execution/node/337/log/:

14:49:41  Auditing /Users/jenkins/jenkins/workspace/d-pr_pr3690_ie_cookie_fix_0.70.x/src/brave/components/brave_sync/extension/brave-crypto
14:49:41  /Users/jenkins/jenkins/workspace/d-pr_pr3690_ie_cookie_fix_0.70.x/src/brave/components/brave_sync/extension/brave-crypto: npm audit
14:49:42  Auditing /Users/jenkins/jenkins/workspace/d-pr_pr3690_ie_cookie_fix_0.70.x/src/brave/components/brave_sync/extension/brave-sync
14:49:42  /Users/jenkins/jenkins/workspace/d-pr_pr3690_ie_cookie_fix_0.70.x/src/brave/components/brave_sync/extension/brave-sync: npm audit
14:49:58  
14:49:58  npm ERR! code ENOAUDIT
14:49:58  npm ERR! audit Your configured registry (https://registry.npmjs.org/) does not support audit requests, or the audit endpoint is temporarily unavailable.

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Oct 16, 2019
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 0.70.x approved after deliberating with @brave/uplift-approvers. Both CI/Jenkins and CI/Travis passed without any issues. Please make sure all the correct labels are added and the associated issue is moved into the correct milestone.

@bsclifton bsclifton merged commit 5f4752d into 0.70.x Oct 16, 2019
@bsclifton bsclifton deleted the pr3690_ie_cookie_fix_0.70.x branch October 16, 2019 04:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants