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-131443 / 24.10.0 / App Info Card -> App Version Overlap (by AlexKarpov98) #10772

Merged
merged 2 commits into from
Sep 30, 2024
Merged

NAS-131443 / 24.10.0 / App Info Card -> App Version Overlap (by AlexKarpov98) #10772

merged 2 commits into from
Sep 30, 2024

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x 168347c2ceee66f9fc33e3253486b851291b27d8

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 e4cf522989e933c6bd6990d9d38c9a317795c887

Testing:

Before:
Screenshot 2024-09-30 at 15 44 21

After:
Screenshot 2024-09-30 at 15 40 11

Original PR: #10771
Jira URL: https://ixsystems.atlassian.net/browse/NAS-131443

@AlexKarpov98 AlexKarpov98 marked this pull request as ready for review September 30, 2024 12:51
@AlexKarpov98 AlexKarpov98 requested a review from a team as a code owner September 30, 2024 12:51
@AlexKarpov98 AlexKarpov98 requested review from undsoft and removed request for a team September 30, 2024 12:51
AlexKarpov98
AlexKarpov98 approved these changes Sep 30, 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 merged commit b50d29d into stable/electriceel Sep 30, 2024
2 checks passed
@AlexKarpov98 AlexKarpov98 deleted the NAS-131443-24.10.0 branch September 30, 2024 12:51
@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 Sep 30, 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

@undsoft undsoft Awaiting requested review from undsoft undsoft is a code owner automatically assigned from truenas/ui-team

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