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

Fixed Disabled ads tracking option is reverted after reloading (uplift to 1.15.x) #6730

Merged
merged 1 commit into from
Sep 30, 2020

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Sep 30, 2020

Uplift of #6693
Resolves brave/brave-browser#11585

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.

Fixed Disabled ads tracking option is reverted after reloading
@simonhong simonhong requested a review from a team September 30, 2020 00:02
@simonhong simonhong self-assigned this Sep 30, 2020
@kjozwiak
Copy link
Member

test-browser failed on macOS due to RewardsContributionBrowserTest.MultipleTipsProduceMultipleFeesWithVerifiedWallet failing as per https://ci.brave.com/job/pr-brave-browser-pr6693_uplift_1.15.x-macos/1/flowGraphTable/. However, this is a known intermittent failure that doesn't block uplift.

21:44:56  [  FAILED  ] RewardsContributionBrowserTest.MultipleTipsProduceMultipleFeesWithVerifiedWallet, where TypeParam =  and GetParam() =  (1385 ms)
21:44:56  [620/620] RewardsContributionBrowserTest.MultipleTipsProduceMultipleFeesWithVerifiedWallet (1596 ms)
21:44:56  1 test failed:
21:44:56      RewardsContributionBrowserTest.MultipleTipsProduceMultipleFeesWithVerifiedWallet (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:465)

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.15.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #6693 (comment).

@kjozwiak kjozwiak merged commit 3284dba into 1.15.x Sep 30, 2020
@kjozwiak kjozwiak deleted the pr6693_uplift_1.15.x branch September 30, 2020 18:37
@kjozwiak kjozwiak added this to the 1.15.x - Release milestone Sep 30, 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.

2 participants