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

Do not show ipfs items if the ipfs daemon is not launched (uplift to 1.26.x) #8884

Merged
merged 1 commit into from
May 23, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented May 20, 2021

Uplift of #8856
Resolves brave/brave-browser#15935

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.

@brave-builds brave-builds requested a review from a team May 20, 2021 18:31
@brave-builds brave-builds self-assigned this May 20, 2021
@brave-builds brave-builds added this to the 1.26.x - Beta milestone May 20, 2021
@bridiver bridiver modified the milestone: 1.26.x - Beta May 20, 2021
@kjozwiak
Copy link
Member

Restarting macOS as build failed as per https://ci.brave.com/job/pr-brave-browser-pr8856_issue-15935_1.26.x-macos/1/execution/node/153/log/.

18:27:52  FAILED: obj/content/browser/browser/browser_main_loop.o 

test-browser failed on Linux as per https://ci.brave.com/job/pr-brave-browser-pr8856_issue-15935_1.26.x-linux/1/testReport/. However, this is a known intermittent failure and unrelated to this specific PR.

 linux / test-browser / RewardsPublisherBrowserTest.VisitRegisteredPublisher

Restarting post-init as it failed to checkout version control due to insufficient space as per https://ci.brave.com/job/pr-brave-browser-pr8856_issue-15935_1.26.x-post-init/1/console

/home/ubuntu/workspace/pr-brave-browser-pr8856_issue-15935_1.26.x-post-init: No space left on device

@kjozwiak
Copy link
Member

test-browser failed on macOS as per https://ci.brave.com/job/pr-brave-browser-pr8856_issue-15935_1.26.x-macos/2/testReport. However, this is a known intermittent issue and unrelated to this specific PR.

macos-x64 / test-browser / AdBlockServiceTest.CnameCloakedRequestsGetBlocked

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

@kjozwiak kjozwiak merged commit 6f5cf43 into 1.26.x May 23, 2021
@kjozwiak kjozwiak deleted the pr8856_issue-15935_1.26.x branch May 23, 2021 06:10
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.

4 participants