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-131014 / 24.10-RC.1 / Update dedup warnings (by undsoft) #10639

Merged
merged 3 commits into from
Sep 9, 2024
Merged

NAS-131014 / 24.10-RC.1 / Update dedup warnings (by undsoft) #10639

merged 3 commits into from
Sep 9, 2024

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Sep 9, 2024

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

git reset --hard HEAD~1
git cherry-pick -x ca868a655d46119834768a87d1dc5b51dae207ab
git cherry-pick -x 458218be40c39e6606d97610b74292008382c4d5
git cherry-pick -x 6835a2ae60d0b928d2b7301bbda3215c076dec29

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

Changes:

Changes text and makes dedup warning more prominent.

Testing:

Check the warning in different scenarios.

Downstream

Affects Reasoning
Documentation Different text in the warning when dedup is enabled. Warning is more prominent.

Original PR: #10635
Jira URL: https://ixsystems.atlassian.net/browse/NAS-131014

@undsoft undsoft marked this pull request as ready for review September 9, 2024 12:42
@undsoft undsoft requested a review from a team as a code owner September 9, 2024 12:42
@undsoft undsoft requested review from RehanY147 and removed request for a team September 9, 2024 12:42
undsoft
undsoft approved these changes Sep 9, 2024
View reviewed changes
Copy link
Collaborator

@undsoft undsoft left a comment

Choose a reason for hiding this comment

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

backported

@undsoft
Merge branch 'stable/electriceel' of github.com:truenas/webui into NA…
f12d3cd 
…S-131014-24.10-RC.1

# Conflicts:
#	src/assets/i18n/fr.json
#	src/assets/i18n/ga.json
AlexKarpov98
AlexKarpov98 approved these changes Sep 9, 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.

@codecov Codecov
Copy link

codecov bot commented Sep 9, 2024

Codecov Report

Attention: Patch coverage is 84.00000% with 4 lines in your changes missing coverage. Please review.

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

Files with missing lines Patch % Lines
...options-section/other-options-section.component.ts 84.00% 4 Missing ⚠️
Additional details and impacted files 
@@                  Coverage Diff                  @@
##             stable/electriceel   #10639   +/-   ##
=====================================================
  Coverage                      ?   79.64%           
=====================================================
  Files                         ?     1568           
  Lines                         ?    51256           
  Branches                      ?     5917           
=====================================================
  Hits                          ?    40825           
  Misses                        ?    10431           
  Partials                      ?        0

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

@undsoft undsoft merged commit 76c7fad into stable/electriceel Sep 9, 2024
9 checks passed
@undsoft undsoft deleted the NAS-131014-24.10-RC.1 branch September 9, 2024 13:21
@bugclerk
Copy link
Contributor Author

bugclerk commented Sep 9, 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 9, 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 undsoft approved these changes

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

Assignees

@undsoft undsoft

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

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