Skip to content

/mastodon

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

madmath03 commented Oct 2, 2019

✨ 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 :sparkles: Add an LDAP Mail attribute config Nov 24, 2019
@Gargron
Gargron approved these changes Dec 1, 2019
View changes
@Gargron Gargron changed the title :sparkles: Add an LDAP Mail attribute config ✨ Add an LDAP Mail attribute config Dec 1, 2019
@Gargron

This comment has been minimized.

Sign in to view
Copy link
Member

Gargron commented Dec 1, 2019

Sorry for the delay. Please rebase.
@madmath03

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

madmath03 commented Dec 1, 2019

Hi @Gargron,

No problem.
This should be okay now.
@Gargron

This comment has been minimized.

Sign in to view
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?
@madmath03
✨ Add an LDAP Mail attribute config
Verified
This commit was signed with a verified signature.
madmath03 Mathieu Brunot
GPG key ID: 81584BEAF692D7E0 Learn about signing commits
Loading status checks…
fe0f619 
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
@madmath03 madmath03 force-pushed the Monogramm:feature/ldap_mail branch from 12fc8b7 to fe0f619 Dec 1, 2019
@madmath03

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

madmath03 commented Dec 1, 2019

My bad.
I did not notice that when I pushed. It should be all good now.
@Gargron
Gargron approved these changes Dec 1, 2019
View changes
@Gargron Gargron merged commit bd8dc9b into tootsuite:master Dec 1, 2019
2 checks passed
2 checks passed
build-and-test Workflow: build-and-test
Details
codeclimate All good!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gargron Gargron

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@madmath03 @Gargron
You can’t perform that action at this time.