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

Update various strings for IPFS (uplift to 1.19.x) #7424

Merged
merged 1 commit into from
Dec 14, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Dec 13, 2020

Uplift of #7415
Resolves brave/brave-browser#13169

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 requested a review from a team December 13, 2020 03:31
@brave-builds brave-builds self-assigned this Dec 13, 2020
@brave-builds brave-builds added this to the 1.19.x - Beta milestone Dec 13, 2020
@bbondy
Copy link
Member

bbondy commented Dec 13, 2020

CI is good to go:


[2020-12-13T03:49:56.074Z]       for (const auto& pair : node.DictItems()) {

[2020-12-13T03:49:56.074Z]                        ^

[2020-12-13T03:49:56.074Z] ../../base/json/json_writer.cc:151:12: note: use non-reference type 'std::__1::pair<const std::__1::basic_string<char> &, const base::Value &>'

[2020-12-13T03:49:56.074Z]       for (const auto& pair : node.DictItems()) {

[2020-12-13T03:49:56.074Z]            ^~~~~~~~~~~~~~~~~~

[2020-12-13T03:49:56.074Z] 1 error generated.

@bbondy
Copy link
Member

bbondy commented Dec 13, 2020

Tested on Nightly and it has the new strings.

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.19.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 933a7b1 into 1.19.x Dec 14, 2020
@kjozwiak kjozwiak deleted the pr7415_ipfs-text-updates_1.19.x branch December 14, 2020 16:11
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