Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

26b63540

Commit 26b63540 authored 6 years ago by Ivan Tashkinov

Downloads
- Patches
- Plain Diff

[#923] Support for multiple (external) registrations per user via Registration.

parent 2a96283e

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 1 addition, 1 deletion

config/config.exs
lib/pleroma/registration.ex 36 additions, 0 deletions

lib/pleroma/registration.ex
lib/pleroma/user.ex 4 additions, 12 deletions

lib/pleroma/user.ex
lib/pleroma/web/auth/authenticator.ex 3 additions, 3 deletions

lib/pleroma/web/auth/authenticator.ex
lib/pleroma/web/auth/ldap_authenticator.ex 1 addition, 1 deletion

lib/pleroma/web/auth/ldap_authenticator.ex
lib/pleroma/web/auth/pleroma_authenticator.ex 31 additions, 20 deletions

lib/pleroma/web/auth/pleroma_authenticator.ex
lib/pleroma/web/oauth/oauth_controller.ex 1 addition, 1 deletion

lib/pleroma/web/oauth/oauth_controller.ex
priv/repo/migrations/20190315101315_add_auth_provider_and_auth_provider_uid_to_users.exs 0 additions, 12 deletions

...1315_add_auth_provider_and_auth_provider_uid_to_users.exs
priv/repo/migrations/20190315101315_create_registrations.exs 16 additions, 0 deletions

priv/repo/migrations/20190315101315_create_registrations.exs

with 93 additions and 50 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment