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.

Sign up for GitHub

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

Jump to bottom

Change default ads per hour via variations service - 1.21.x #8122

Merged
merged 2 commits into from
Mar 15, 2021
Merged

Change default ads per hour via variations service - 1.21.x #8122

merged 2 commits into from
Mar 15, 2021

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Mar 4, 2021 •
edited by kjozwiak
Loading

Uplift of #8086 & #8206
Resolves brave/brave-browser#14377 & brave/brave-browser#14605

  • 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.

@tmancey tmancey added this to the 1.21.x - Release milestone Mar 4, 2021
@tmancey tmancey requested a review from a team March 4, 2021 16:42
@tmancey tmancey self-assigned this Mar 4, 2021
@tmancey tmancey changed the title Change default ads per hour via variations service Change default ads per hour via variations service - 1.22.x Mar 5, 2021
@tmancey tmancey changed the title Change default ads per hour via variations service - 1.22.x Change default ads per hour via variations service - 1.21.x Mar 5, 2021
@kjozwiak
Copy link
Member

Waiting on #8206.

@tmancey
Fixes "Maximum number of ads displayed" isn't being set to "5" when u…
9864fb6 
…pgrading - follow up to #14377

# Conflicts:
#	components/brave_ads/browser/ads_service_impl.cc
#	components/brave_ads/browser/prefs_util.cc
#	components/brave_ads/browser/prefs_util.h
@tmancey
Copy link
Collaborator Author

tmancey commented Mar 12, 2021

#8206 has been merged

kjozwiak
kjozwiak approved these changes Mar 15, 2021
View reviewed changes
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.21.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #8086 (comment).

@kjozwiak kjozwiak merged commit f5275b1 into 1.21.x Mar 15, 2021
@kjozwiak kjozwiak deleted the issues/14377-1.21.x branch March 15, 2021 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@tmancey tmancey

Labels
feature/ads
Projects
None yet
Milestone
1.21.x - Release #4
Development

Successfully merging this pull request may close these issues.
2 participants
@tmancey @kjozwiak