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

Match exact host in autoplay whitelist before matching eTLD+1 (uplift to 1.6.x) #4786

Merged
merged 1 commit into from
Mar 4, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Feb 28, 2020

Uplift of #4741
Fixes brave/brave-browser#4621

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 Feb 28, 2020
@brave-builds brave-builds added this to the 1.6.x - Dev milestone Feb 28, 2020
@kjozwiak
Copy link
Member

npm run audit_deps failed on Android due to ENOAUDIT as per https://ci.brave.com/job/brave-browser-build-pr/job/pr4741_ap_whitelist_subdomains_1.6.x/1/execution/node/425/log/. This is a known intermittent issue as per brave/brave-browser#4459 and not related to this specific PR.

@bsclifton bsclifton requested review from a team and removed request for bbondy, kjozwiak, bsclifton, rebron and srirambv March 2, 2020 18:50
@bsclifton
Copy link
Member

CI looks good! There was an audit failure (known intermittent issue). But otherwise looks great!

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.6.x approved after deliberating with @brave/uplift-approvers. Only failure was related to ENOAUDIT as per #4786 (comment). However, it's a known intermittent issue that's not related to this specific PR. QA also went through the original PR on Nightly as per #4741 (comment).

Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit 15132c2 into 1.6.x Mar 4, 2020
@kjozwiak kjozwiak deleted the pr4741_ap_whitelist_subdomains_1.6.x branch March 4, 2020 02:44
@bbondy bbondy modified the milestones: 1.6.x - Beta, 1.7.x - Dev Mar 10, 2020
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.

5 participants