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

allow Shields to block urls with invalid origins (uplift to 0.69.x) #3224

Merged
merged 1 commit into from
Aug 27, 2019

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Aug 20, 2019

Uplift of #3210
fix brave/brave-browser#5346
fix brave/brave-browser#5483

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 Aug 20, 2019
@brave-builds brave-builds added this to the 0.69.x - Beta milestone Aug 20, 2019
@bsclifton bsclifton requested review from a team and removed request for bbondy, kjozwiak, bsclifton, rebron and srirambv August 20, 2019 16:56
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.69.x approved after deliberating with @brave/uplift-approvers. Looks like both CI/Jenkins and CI/Travis passed without and errors or failures. Please make sure that all the correct labels are added and the appropriate issue is moved into the correct milestone.

@bsclifton bsclifton merged commit d01b6cf into 0.69.x Aug 27, 2019
@bsclifton bsclifton deleted the pr3210_ca-5346_0.69.x branch August 27, 2019 16:07
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