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

Issues/2601 #1134

Merged
merged 4 commits into from
Dec 19, 2018
Merged

Issues/2601 #1134

merged 4 commits into from
Dec 19, 2018

Conversation

bridiver
Copy link
Collaborator

@bridiver bridiver commented Dec 18, 2018

Fix brave/brave-browser#2601

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

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

@bridiver bridiver self-assigned this Dec 18, 2018
Copy link
Collaborator

@tmancey tmancey left a comment

Choose a reason for hiding this comment

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

Only returns first result when calling GetAds, i.e. try category as "arts & entertainment"

@bridiver bridiver merged commit f5773ee into master Dec 19, 2018
@tmancey tmancey deleted the issues/2601 branch December 19, 2018 18:16
bridiver added a commit that referenced this pull request Dec 20, 2018
@bridiver
Copy link
Collaborator Author

0.60.x ce8ffcb

@rebron
Copy link
Collaborator

rebron commented Dec 20, 2018

Approving uplift-request for 0.59.x-beta. cc: @kjozwiak cc: @srirambv

@rebron
Copy link
Collaborator

rebron commented Dec 20, 2018

This fixes 2601?

@tmancey
Copy link
Collaborator

tmancey commented Dec 20, 2018

@rebron confirmed

Fix brave/brave-browser#2601

tmancey pushed a commit that referenced this pull request Dec 20, 2018
@@ -203,13 +203,14 @@ std::string LoadOnFileTaskRunner(
}

std::vector<ads::AdInfo> GetAdsForCategoryOnFileTaskRunner(
const std::string region,
Copy link
Member

Choose a reason for hiding this comment

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

how granular are the regions? we want to avoid having users uniquely identifiable by region + category

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants