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

NAS-133032 / 24.10.2 / Lock icon is misaligned on some resolutions in apps (by AlexKarpov98) #11198

Merged
merged 2 commits into from
Dec 18, 2024

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x 51d98df91de0a64a4c71a98be093d398aab88593

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 2ee3cc2f033ada320a3f094886ec7a6803bed01e

Testing:
See ticket.

Result:
Screenshot 2024-12-16 at 14 43 48

Original PR: #11190
Jira URL: https://ixsystems.atlassian.net/browse/NAS-133032

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 marked this pull request as ready for review December 18, 2024 09:13
@AlexKarpov98 AlexKarpov98 requested a review from a team as a code owner December 18, 2024 09:13
@AlexKarpov98 AlexKarpov98 requested review from undsoft and removed request for a team and undsoft December 18, 2024 09:13
Copy link

codecov bot commented Dec 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (stable/electriceel@d9208ac). Learn more about missing BASE report.

Additional details and impacted files
@@                  Coverage Diff                  @@
##             stable/electriceel   #11198   +/-   ##
=====================================================
  Coverage                      ?   79.97%           
=====================================================
  Files                         ?     1573           
  Lines                         ?    51501           
  Branches                      ?     5945           
=====================================================
  Hits                          ?    41190           
  Misses                        ?    10311           
  Partials                      ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@AlexKarpov98 AlexKarpov98 merged commit 9f299a7 into stable/electriceel Dec 18, 2024
7 checks passed
@AlexKarpov98 AlexKarpov98 deleted the NAS-133032-24.10.2 branch December 18, 2024 10:11
@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 Dec 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants