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

✨ Add an LDAP Mail attribute config #12053

Merged
merged 1 commit into from
Dec 1, 2019

Conversation

madmath03
Copy link
Contributor

✨ Add an LDAP Mail attribute config

This is just a small improvement that allows to set the LDAP mail attribute.
Also, I suggest a default search filter that allows LDAP users to login from their UID or their email address (just like internal users).

@madmath03 madmath03 changed the title Add an LDAP Mail attribute config [FEATURE] Add an LDAP Mail attribute config Oct 2, 2019
@madmath03 madmath03 changed the title [FEATURE] Add an LDAP Mail attribute config ✨ Add an LDAP Mail attribute config Nov 24, 2019
@Gargron Gargron changed the title ✨ Add an LDAP Mail attribute config ✨ Add an LDAP Mail attribute config Dec 1, 2019
@Gargron
Copy link
Member

Gargron commented Dec 1, 2019

Sorry for the delay. Please rebase.

@madmath03
Copy link
Contributor Author

Hi @Gargron,

No problem.
This should be okay now.

@Gargron
Copy link
Member

Gargron commented Dec 1, 2019

The changeset is now very large, I'm worried something else might get reverted by accident if I merge. Could you please do git reset --hard HEAD~1 to remove the latest commit ("Merge branch..."), git fetch to make sure the info is up to date, then git rebase origin/master?

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
@madmath03
Copy link
Contributor Author

My bad.
I did not notice that when I pushed. It should be all good now.

@Gargron Gargron merged commit bd8dc9b into mastodon:master Dec 1, 2019
@madmath03 madmath03 deleted the feature/ldap_mail branch April 24, 2020 15:52
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.

None yet

2 participants