Resolve conflicts #169
Merged
Resolve conflicts #169
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…roles (#150) * docs: Add docs for error when updating a user with non-existent roles * docs: Move 400 response example to the update roles request * docs: Fix grammar * docs: Add separate headers for all responses * docs: Change comments to descriptions and add body tags * Revert "docs: Change comments to descriptions and add body tags" This reverts commit eba9380. --------- Co-authored-by: Sam Ford <sam.ford@acrolinx.com>
…ex/root API (#158) Co-authored-by: Sam Ford <sam.ford@acrolinx.com>
* docs: Add staffUser, idpUser and rolesSetByIdp properties to user json * docs: Add 400 response for updating a user's roles when their roles are managed by their IDP * docs: Add idpUser, staffUser and rolesSetByIdp properties to data structures --------- Co-authored-by: Sam Ford <sam.ford@acrolinx.com>
rbarbey
approved these changes
Sep 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.