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

Uplift Enable support of Unstoppable Domains and ENS via DoH on Android to 1.24.x #8563

Merged
merged 1 commit into from
Apr 27, 2021

Conversation

yrliou
Copy link
Member

@yrliou yrliou commented Apr 19, 2021

Uplift of #8520 (Ethereum support is removed from this uplift PR)
Resolves brave/brave-browser#15159

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@yrliou yrliou added this to the 1.24.x - Beta milestone Apr 19, 2021
@yrliou yrliou self-assigned this Apr 19, 2021
@yrliou yrliou requested a review from a team as a code owner April 19, 2021 18:31
@yrliou yrliou requested a review from a team April 20, 2021 01:42
@yrliou yrliou added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Apr 26, 2021
@yrliou
Copy link
Member Author

yrliou commented Apr 26, 2021

trivial conflict resolving for android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java, skipping CI expect for android.

@yrliou yrliou force-pushed the UD_ENS_android_1.24.x branch from 2e625c7 to c220590 Compare April 26, 2021 23:35
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.24.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #8520 (comment).

@kjozwiak kjozwiak merged commit d4b2c80 into 1.24.x Apr 27, 2021
@kjozwiak kjozwiak deleted the UD_ENS_android_1.24.x branch April 27, 2021 02:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants