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

Roles with no permission are auto migrated to Administrator roles #17224

Merged
merged 2 commits into from
Dec 12, 2024

Conversation

MikeAlhayek
Copy link
Member

Fix #17216

@MikeAlhayek MikeAlhayek added this to the 2.x milestone Dec 12, 2024
@MikeAlhayek MikeAlhayek requested review from sebastienros and gvkries and removed request for sebastienros December 12, 2024 14:38
@MikeAlhayek MikeAlhayek merged commit aa631d0 into main Dec 12, 2024
23 checks passed
@MikeAlhayek MikeAlhayek deleted the ma/fix-security-roles-migrations branch December 12, 2024 16:51
@MikeAlhayek
Copy link
Member Author

/backport to release/2.1

Copy link
Contributor

Copy link
Contributor

@MikeAlhayek backporting to release/2.1 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Roles with no permission are auto migrated to Administrator roles Fix #17216
Applying: exclude 2.1.3
Using index info to reconstruct a base tree...
M	mkdocs.yml
Falling back to patching base and 3-way merge...
Auto-merging mkdocs.yml
CONFLICT (content): Merge conflict in mkdocs.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 exclude 2.1.3
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Custom roles overwritten after upgrading to OC 2.1.x
2 participants