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

Updated Brave Ads UI copy to "Ads received this month" - 1.17.x #7180

Merged
merged 1 commit into from
Nov 25, 2020

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Nov 18, 2020

Uplift of #7163
Resolves brave/brave-browser#12719

  • 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.17.x - Release milestone Nov 18, 2020
@tmancey tmancey requested a review from a team November 18, 2020 12:04
@tmancey tmancey self-assigned this Nov 18, 2020
@LaurenWags
Copy link
Member

Restarted macOS, Linux, Windows

@kjozwiak
Copy link
Member

@tmancey looks like the above needs to be rebased.

@tmancey tmancey force-pushed the issues/12719-1.17.x branch from 2f6879b to f19c8c0 Compare November 25, 2020 04:20
@kjozwiak
Copy link
Member

Restarting Win x64 via https://ci.brave.com/job/pr-brave-browser-issues-12719-1.17.x-windows/4/ due to build failing as per https://ci.brave.com/job/pr-brave-browser-issues-12719-1.17.x-windows/3/execution/node/200/log/. Looks like there was issues with the node connectivity.

23:56:05  Cannot contact i-04a534545b6634a7a-windows-swarm-0c31abab: hudson.remoting.RequestAbortedException: java.nio.channels.ClosedChannelException
00:01:06  Could not connect to i-04a534545b6634a7a-windows-swarm-0c31abab to send interrupt signal to process

Restarting macOS via https://ci.brave.com/job/pr-brave-browser-issues-12719-1.17.x-macos/4/ due to build failing as per https://ci.brave.com/job/pr-brave-browser-issues-12719-1.17.x-macos/3/execution/node/204/log/.

23:51:21  FAILED: obj/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor/spl_sqrt_floor.o 

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

@kjozwiak kjozwiak merged commit 34c5767 into 1.17.x Nov 25, 2020
@kjozwiak kjozwiak deleted the issues/12719-1.17.x branch November 25, 2020 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants