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

NTP: Prevent top sites interface from handling duplicated site entries (uplift to 1.8.x) #5219

Merged
merged 1 commit into from
Apr 27, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Apr 10, 2020

Uplift of #5173
Fixes brave/brave-browser#9008

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.

@brave-builds brave-builds self-assigned this Apr 10, 2020
@brave-builds brave-builds added this to the 1.8.x - Beta milestone Apr 10, 2020
@bsclifton bsclifton requested review from a team and removed request for bbondy, kjozwiak, bsclifton, rebron and srirambv April 10, 2020 16:45
@kjozwiak
Copy link
Member

Looks like b-b never started. Restarting.

@kjozwiak
Copy link
Member

kjozwiak commented Apr 20, 2020

Looks like macOS and iOS failed to init timing out as per the following:

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-linux labels Apr 20, 2020
@bsclifton bsclifton force-pushed the pr5173_ca-9008_1.8.x branch from 3154641 to 67479db Compare April 20, 2020 22:59
@bsclifton bsclifton force-pushed the pr5173_ca-9008_1.8.x branch from 67479db to 7975d35 Compare April 21, 2020 06:06
@bsclifton
Copy link
Member

CI is good here! There were failures when trying to upload the xUnit test results. Not a blocker- all the tests themselves passed great 👍

@kjozwiak
Copy link
Member

QA verified #5173 on Nightly as per #5173 (comment) and #5173 (comment).

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.8.x approved after deliberating with @brave/uplift-approvers. Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit cf5f897 into 1.8.x Apr 27, 2020
@kjozwiak kjozwiak deleted the pr5173_ca-9008_1.8.x branch April 27, 2020 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants