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

Fixes custom Brave ad notifications should not be shown on Dev channel builds - 1.20.x #7633

Merged
merged 1 commit into from
Jan 20, 2021

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Jan 17, 2021

Uplift of #7608
Resolves brave/brave-browser#13592

  • 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 requested a review from a team January 17, 2021 09:10
@tmancey tmancey self-assigned this Jan 17, 2021
@kjozwiak
Copy link
Member

Restarting macOS due to build failing as per https://ci.brave.com/job/pr-brave-browser-issues-13592-1.20.x-macos/1/execution/node/155/log/. However, this is a known issue that was fixed via #7599. Going to attempt one more restart and if macOS fails again due to the same failure, we'll just merge as it's a known problem and has been fixed.

05:31:23  FAILED: gen/chrome/browser/resources/settings/settings.rollup.js gen/chrome/browser/resources/settings/lazy_load.rollup.js gen/chrome/browser/resources/settings/shared.rollup.js gen/chrome/browser/resources/settings/build_manifest.json

@kjozwiak kjozwiak added this to the 1.20.x - Beta milestone Jan 17, 2021
@tmancey tmancey changed the title Fixes custom Brave ad notifications should not be shown on Dev channel builds Fixes custom Brave ad notifications should not be shown on Dev channel builds - 1.20.x Jan 18, 2021
@tmancey
Copy link
Collaborator Author

tmancey commented Jan 18, 2021

Restarting macOS due to same reason as posted by @kjozwiak

@bsclifton bsclifton force-pushed the issues/13592-1.20.x branch from 702fd4e to 85f6b04 Compare January 20, 2021 00:21
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.20.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #7608 (comment). As per discussions via Slack, this technically can't be checked till it lands in 1.20.x but we did make sure that the PR didn't regress Nightly.

@kjozwiak kjozwiak merged commit 07ccebe into 1.20.x Jan 20, 2021
@kjozwiak kjozwiak deleted the issues/13592-1.20.x branch January 20, 2021 20:54
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.

2 participants