[Merge-conflict] - Resolved the merge conflict #1431
Closed
Conversation
This file contains hidden or 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
Sync Dev to Main
* Feat : username and twitter id contains @ / special characters in the value in some user data. (#1320) * feat:add validations in the signup api to check that username must be in the specific format and social id must not contain the special character @ to it also modify the error with a proper error message * fix:the error message description * fix:change the error message according to specific social id change * fix:change the regex validation such that now it will accept numbers or characters or combination of both * refactor:change the error message to meaningful text * feat:add tests for invalid username and valid username and invalid social id * fix:match the error message with the failing test case message, update the error messages in the signup api * fix:remove unnecessary validation for linkedin_id, intagram_id we are not sending it during signup also remove the tests for that * fix:remove unnecessary validation for linkedin_id, intagram_id we are not sending it during signup also remove the tests for that * feat:add unit testing for the update user function to check if invalid username and twitter_id is passed or not --------- Co-authored-by: pushpendu <[email protected]> * add option to set privilaged roles in staging backend * remove console logs * modify the condition to check non production env * add support to other roles update in staging (#1354) * add support to other roles * modify condition to forbid in production * add an api to remove privilaged roles to all users (#1355) * add an api to remove privilaged roles to all users * add middleware to allow body * adds metrics for users update route (#1347) * Fixing Task Reassignment Status Update Issue (#1351) * adds the logic to modify the user status of old assignee * Adds integration test * Consolidated Multi-Line Variable Declarations into Single Line --------- Co-authored-by: Abhay Patil <[email protected]> Co-authored-by: pushpendu <[email protected]> Co-authored-by: ritikjaiswal75 <[email protected]> Co-authored-by: Amit Prakash <[email protected]> Co-authored-by: Ritik Jaiswal <[email protected]>
…licts Dev to Main Sync
Dev to Main Sync
Revert "Dev to Main Sync"
Pratiyushkumar
changed the title
|
Conflicts are fixed #1438 |
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.
Resolved merge conflict that occured in PR
#1420