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.

Sign up for GitHub

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

Jump to bottom

1.32.x - Uplift pull request #10521 from brave/settings-icons-fix #10534

Merged
merged 1 commit into from
Oct 18, 2021
Merged

1.32.x - Uplift pull request #10521 from brave/settings-icons-fix #10534

merged 1 commit into from
Oct 18, 2021

Conversation

petemill
Copy link
Member

@petemill petemill commented Oct 15, 2021 •
edited
Loading

Uplifts brave/brave-browser#18775 via #10521
Also uplifts brave/brave-browser#18786 via #10535 which fixes a syntax issue with #10521

@petemill petemill added this to the 1.32.x - Beta milestone Oct 15, 2021
@petemill petemill requested a review from a team October 15, 2021 04:05
@petemill petemill self-assigned this Oct 15, 2021
@petemill petemill force-pushed the settings-icons-fix-1.32.x branch from 5117168 to 7aa3b07 Compare October 15, 2021 04:07
@kjozwiak
Copy link
Member

Restarting macOS due to dist failing as per https://ci.brave.com/job/pr-brave-browser-settings-icons-fix-1.32.x-macos/1/execution/node/236/log/. Seems like the node was disconnected/timed out.

02:59:09  Cannot contact mac-imac1-ky: java.lang.InterruptedException
06:53:20  Sending interrupt signal to process
06:53:23  Sending interrupt signal to process
06:53:29  Sending interrupt signal to process
06:53:35  Sending interrupt signal to process
06:53:37  Sending interrupt signal to process
06:53:40  After 20s process did not stop

kjozwiak
kjozwiak approved these changes Oct 18, 2021
View reviewed changes
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.32 approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #10521 (comment).

@kjozwiak kjozwiak merged commit 5c5b7b2 into 1.32.x Oct 18, 2021
@kjozwiak kjozwiak deleted the settings-icons-fix-1.32.x branch October 18, 2021 03:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@petemill petemill

Labels
None yet
Projects
None yet
Milestone
1.32.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@petemill @kjozwiak