summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authord42 <d42@users.noreply.github.com>2018-10-10 21:33:16 +0200
committerd42 <d42@users.noreply.github.com>2018-10-10 21:33:16 +0200
commit95694890ea29ab2b2f1d27281dc31787bf1ec345 (patch)
tree7384c657a026484ff89a03587ad0d6531487cc1f
parent0df044b267ff87bd19562832b39917f84977f2b7 (diff)
downloadspejstore-95694890ea29ab2b2f1d27281dc31787bf1ec345.tar.gz
spejstore-95694890ea29ab2b2f1d27281dc31787bf1ec345.tar.bz2
spejstore-95694890ea29ab2b2f1d27281dc31787bf1ec345.zip
associate_by_email
-rw-r--r--spejstore/settings.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/spejstore/settings.py b/spejstore/settings.py
index 2ce15f8..4a1b11c 100644
--- a/spejstore/settings.py
+++ b/spejstore/settings.py
@@ -134,12 +134,13 @@ SOCIAL_AUTH_PIPELINE = (
'social_core.pipeline.social_auth.social_uid',
'social_core.pipeline.social_auth.social_user',
'social_core.pipeline.user.get_username',
+ 'social_core.pipeline.social_auth.associate_by_email',
'social_core.pipeline.user.create_user',
'social_core.pipeline.social_auth.associate_user',
'social_core.pipeline.social_auth.load_extra_data',
'social_core.pipeline.user.user_details',
'auth.pipeline.staff_me_up',
- 'social_core.pipeline.social_auth.associate_by_email',)
+)
# Internationalization
# https://docs.djangoproject.com/en/1.10/topics/i18n/