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-133792 / 24.10.2 / NAS0-133792: Only allow local groups for groups in user form (by undsoft) #11396

Merged
merged 2 commits into from
Jan 27, 2025

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x d571c68a54ecc5a0de34cecc4bd52394f0cf8071
git cherry-pick -x fdb0143b4279cff94b29bf6b9cae61559c26b689
git cherry-pick -x 8fdf54bdaf36d44cf037e0e40e6af5649fb40b05

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 7ac1d772d5a9f294e6a42dfcd1383a5c00d18495

Changes:

See ticket.

Original PR: #11388
Jira URL: https://ixsystems.atlassian.net/browse/NAS-133792

@undsoft undsoft marked this pull request as ready for review January 26, 2025 21:36
@undsoft undsoft requested a review from a team as a code owner January 26, 2025 21:36
@undsoft undsoft requested review from bvasilenko and removed request for a team January 26, 2025 21:36
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

Copy link

codecov bot commented Jan 26, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release/24.10.2@0b7b26c). Learn more about missing BASE report.

Additional details and impacted files
@@                Coverage Diff                 @@
##             release/24.10.2   #11396   +/-   ##
==================================================
  Coverage                   ?   80.00%           
==================================================
  Files                      ?     1574           
  Lines                      ?    51530           
  Branches                   ?     5948           
==================================================
  Hits                       ?    41226           
  Misses                     ?    10304           
  Partials                   ?        0           

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

@undsoft undsoft merged commit d25c7f8 into release/24.10.2 Jan 27, 2025
7 checks passed
@undsoft undsoft deleted the NAS-133792-24.10.2 branch January 27, 2025 00:52
@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 Jan 27, 2025
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