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

fix(v1.6.1): Stops local sys admin from creating national level staff #8160

Closed

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Dec 5, 2024

Automated PR to merge changes from develop to release-v1.6.1

I failed to cherry-pick the changes automatically because of the following:

Auto-merging packages/gateway/src/features/user/root-resolvers.ts
CONFLICT (content): Merge conflict in packages/gateway/src/features/user/root-resolvers.ts
Auto-merging packages/gateway/src/features/user/utils/index.ts
CONFLICT (content): Merge conflict in packages/gateway/src/features/user/utils/index.ts
error: could not apply a9c6fa8e4... Move access mgnt into the gateway service

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.1-8112-26938:auto-pr-release-v1.6.1-8112-26938
git fetch origin ocrvs-7698-2:ocrvs-7698-2

git checkout auto-pr-release-v1.6.1-8112-26938
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick a9c6fa8e4 fb400bd11 b46c67ea9 101ceee84 f18c37639 bef4a9ff3 5b9aceedc 274fcb637 00d19a621 64e57eee1

@github-actions github-actions bot requested a review from Siyasanga December 5, 2024 10:11
@Zangetsu101
Copy link
Collaborator

Closing this as it was merged to the release branch directly

@Zangetsu101 Zangetsu101 closed this Dec 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant