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

NAS-130805 / 24.10-RC.1 / Text overlap is not working in some places (by AlexKarpov98) #10563

Merged
merged 2 commits into from
Aug 28, 2024
Merged

NAS-130805 / 24.10-RC.1 / Text overlap is not working in some places (by AlexKarpov98) #10563

merged 2 commits into from
Aug 28, 2024

Conversation

bugclerk
Copy link
Contributor

Automatic cherry-pick failed. Please resolve conflicts by running:

git reset --hard HEAD~1
git cherry-pick -x c0a42b9c71c15945e55f56e4f12d17cb2f735a70
git cherry-pick -x 3abb599e784f2976b5aff2933499ec74ba5f1297
git cherry-pick -x bd2fadb722e798d867f290213d96a4c86cdfd7b5
git cherry-pick -x 51ac9236020d2ae5a13253fb59ea2195ab67e66c

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x a2bdce18adf60bc96b3373ddc103dced6becd057

Testing: see ticket.

Original PR: #10561
Jira URL: https://ixsystems.atlassian.net/browse/NAS-130805

@AlexKarpov98 AlexKarpov98 marked this pull request as ready for review August 28, 2024 08:05
@AlexKarpov98 AlexKarpov98 requested a review from a team as a code owner August 28, 2024 08:05
@AlexKarpov98 AlexKarpov98 requested review from undsoft and AlexKarpov98 and removed request for a team and undsoft August 28, 2024 08:05
AlexKarpov98
AlexKarpov98 approved these changes Aug 28, 2024
View reviewed changes
Copy link
Contributor

@AlexKarpov98 AlexKarpov98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ported.

@AlexKarpov98 AlexKarpov98 enabled auto-merge (squash) August 28, 2024 08:05
@AlexKarpov98 AlexKarpov98 merged commit 9c1359a into stable/electriceel Aug 28, 2024
7 checks passed
@AlexKarpov98 AlexKarpov98 deleted the NAS-130805-24.10-RC.1 branch August 28, 2024 08:38
@bugclerk
Copy link
Contributor Author

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Aug 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@AlexKarpov98 AlexKarpov98 AlexKarpov98 approved these changes

Assignees

@AlexKarpov98 AlexKarpov98

Labels
no-time-tracked
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bugclerk @AlexKarpov98