[FIX] Merge user custom fields on LDAP sync #17339
Merged
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
|
|
tobiasge
force-pushed
the
fix-15374
branch
4 times, most recently
from
6701426 to
a1479af
Compare
tobiasge
force-pushed
the
fix-15374
branch
2 times, most recently
from
fdeb4d3 to
93d594f
Compare
Fix RocketChat#15374 Merge current custom fields with new ones from LDAP.
Contributor
Author
|
Could one of the maintainers add a review? If another solution is preferred I would implement it. |
Contributor
|
@pierre-lehnen-rc any updates on this? We'd really love to see it fixed and it seems to be so simple. |
pierre-lehnen-rc
approved these changes
Jun 23, 2020
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Closes #15374
This fixes the mentioned issue by merging the current
customFieldswith the changes from LDAP.