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-130951 / 24.10-RC.1 / Dashboard widgets | Some widget titles are not translated (by AlexKarpov98) #10605

Merged
merged 2 commits into from
Sep 2, 2024

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Sep 2, 2024

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

git reset --hard HEAD~1
git cherry-pick -x 49f0d6f8d71c79523b871a8ee5a4979ce0ebd6fb

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 3c81d82b4bfd9a8d57eb05d6f72e30812ad5ccf1

Code review should be enough.

Original PR: #10603
Jira URL: https://ixsystems.atlassian.net/browse/NAS-130951

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 September 2, 2024 10:37
@AlexKarpov98 AlexKarpov98 requested a review from a team as a code owner September 2, 2024 10:37
@AlexKarpov98 AlexKarpov98 requested review from RehanY147 and removed request for a team and RehanY147 September 2, 2024 10:37
@AlexKarpov98 AlexKarpov98 enabled auto-merge (squash) September 2, 2024 10:37
@AlexKarpov98 AlexKarpov98 merged commit 80e24b4 into stable/electriceel Sep 2, 2024
7 checks passed
@AlexKarpov98 AlexKarpov98 deleted the NAS-130951-24.10-RC.1 branch September 2, 2024 11:07
Copy link

codecov bot commented Sep 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

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

Additional details and impacted files
@@                  Coverage Diff                  @@
##             stable/electriceel   #10605   +/-   ##
=====================================================
  Coverage                      ?   79.62%           
=====================================================
  Files                         ?     1567           
  Lines                         ?    51167           
  Branches                      ?     5903           
=====================================================
  Hits                          ?    40743           
  Misses                        ?    10424           
  Partials                      ?        0           

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

@bugclerk
Copy link
Contributor Author

bugclerk commented Sep 2, 2024

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