Skip to content

Commit ab6be11

Browse files
authored
Merge pull request #991 from CDLUC3/develop
Merge Develop to the main branch
2 parents 6b407fa + 0c100ae commit ab6be11

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

settings/settings.py.j2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,8 @@ NEWSFEED_POLLING_INTERVAL = 1800
349349

350350
SESSION_COOKIE_AGE = 7 * 24 * 60 * 60
351351
SESSION_EXPIRE_AT_BROWSER_CLOSE = True
352-
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
352+
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
353+
SESSION_ENGINE = "django.contrib.sessions.backends.db"
353354
SESSION_COOKIE_PATH = '/'
354355

355356
# EZID administrator account

settings/tests.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,8 @@
345345

346346
SESSION_COOKIE_AGE = 7 * 24 * 60 * 60
347347
SESSION_EXPIRE_AT_BROWSER_CLOSE = True
348-
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
348+
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
349+
SESSION_ENGINE = "django.contrib.sessions.backends.db"
349350
SESSION_COOKIE_PATH = '/'
350351

351352
# EZID administrator account

0 commit comments

Comments
 (0)