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

Implement state level ads delivery - 1.11.x #5850

Closed
wants to merge 1 commit into from
Closed

Implement state level ads delivery - 1.11.x #5850

wants to merge 1 commit into from

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Jun 15, 2020 •
edited by bsclifton
Loading

Uplift of #5602
Resolves brave/brave-browser#9200

  • 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.11.x - Beta milestone Jun 15, 2020
@tmancey tmancey requested a review from a team June 15, 2020 20:51
@tmancey tmancey self-assigned this Jun 15, 2020
@tmancey tmancey changed the title Implement state level ads delivery Implement state level ads delivery - 1.11.x Jun 17, 2020
@NejcZdovc NejcZdovc removed their request for review June 17, 2020 07:33
@tmancey tmancey force-pushed the issues/9200-1.11.x branch 4 times, most recently from f7ff64d to 49153ed Compare July 7, 2020 18:35
@kjozwiak
Copy link
Member

kjozwiak commented Jul 9, 2020

Asked discussed with @jimmy and @rebron, this isn't making 1.11.x. However, we'll try getting this into the next 1.11.x HF once we get a minor CR 84 bump which is bound to happen. At that point, we'll need to rebase the above as there's already a merge conflict as per the above.

@bbondy
Copy link
Member

bbondy commented Jul 9, 2020

@tmancey FYI looks like there's merge conflicts

@tmancey
Implement state level ads delivery
8fe8aa4 
# Conflicts:
#	browser/ui/BUILD.gn
@tmancey
Copy link
Collaborator Author

tmancey commented Jul 10, 2020

CI failed for macOS and known audit deps, restarting macOS

@tmancey tmancey added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Jul 10, 2020
@NejcZdovc NejcZdovc removed the request for review from kylehickinson July 15, 2020 06:48
@bsclifton
Copy link
Member

Removing milestone for the moment - 1.11.x is live

@bsclifton bsclifton removed this from the 1.11.x - Release milestone Jul 21, 2020
@tmancey
Copy link
Collaborator Author

tmancey commented Jul 24, 2020

Closing as it was decided to let this feature ride the trains

@tmancey tmancey closed this Jul 24, 2020
@tmancey tmancey deleted the issues/9200-1.11.x branch July 24, 2020 00:21
@kjozwiak kjozwiak removed the request for review from a team July 31, 2020 04:09
@kjozwiak kjozwiak removed the CI/skip-android Do not run CI builds for Android label Jul 31, 2020
@kjozwiak kjozwiak removed CI/skip-ios Do not run CI builds for iOS CI/skip-linux feature/ads labels Jul 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tmancey @kjozwiak @bbondy @bsclifton