Skip to content

Conversation

@bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x bc0f3bc93ae63fef00f3ecd923d49884b10a751c
git cherry-pick -x 8af299a05b5e586b63c8968ce731110caca7a709

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 28b31646e2977348697abc8ccd0e1c970429369d

Changes:

image

Testing:

Verify both fields are visible and can be entered/edited.

Downstream

Affects Reasoning
Documentation Add back hosts allow/deny to smb shares
Testing Add back hosts allow/deny to smb shares

Original PR: #13051

@bugclerk
Copy link
Contributor Author

@william-gr william-gr marked this pull request as ready for review December 31, 2025 22:59
@codecov
Copy link

codecov bot commented Jan 1, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (stable/goldeye@b66c4cf). Learn more about missing BASE report.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@                Coverage Diff                @@
##             stable/goldeye   #13056   +/-   ##
=================================================
  Coverage                  ?   86.18%           
=================================================
  Files                     ?     1826           
  Lines                     ?    67316           
  Branches                  ?     8070           
=================================================
  Hits                      ?    58013           
  Misses                    ?     9303           
  Partials                  ?        0           

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

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

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.

@william-gr seems like something is wrong here.
.yarn/cache

Image

@william-gr william-gr merged commit b68c8d6 into stable/goldeye Jan 5, 2026
13 checks passed
@william-gr william-gr deleted the NAS-139116-25.10.2 branch January 5, 2026 17:30
@bugclerk
Copy link
Contributor Author

bugclerk commented Jan 5, 2026

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 Jan 5, 2026
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.

4 participants