summaryrefslogtreecommitdiffstats
path: root/spejstore/settings.py
diff options
context:
space:
mode:
Diffstat (limited to 'spejstore/settings.py')
-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/