Merge branch 'hotfix/24.07.1' into develop

CenterForOpenScience · Sep 18, 2024 · 73dbff8 · 73dbff8
2 parents ff828d8 + 4eefa52
commit 73dbff8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -39,7 +39,7 @@ jobs:
       postgres:
         image: postgres
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -66,7 +66,7 @@ jobs:
       postgres:
         image: postgres
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -93,7 +93,7 @@ jobs:
       postgres:
         image: postgres
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -122,7 +122,7 @@ jobs:
       postgres:
         image: postgres
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -150,7 +150,7 @@ jobs:
         image: postgres
 
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s

diff --git a/admin/base/filters.py b/admin/base/filters.py
@@ -1,5 +1,4 @@
 from django import template
-from django.utils.safestring import mark_safe
 import json
 
 
@@ -8,4 +7,4 @@
 
 @register.filter
 def jsonify(o):
-    return mark_safe(json.dumps(o))
+    return json.dumps(o)
diff --git a/admin/base/templatetags/filters.py b/admin/base/templatetags/filters.py
@@ -1,10 +1,9 @@
 # h/t https://djangosnippets.org/snippets/1250/
 from django import template
-from django.utils.safestring import mark_safe
 import json
 
 register = template.Library()
 
 @register.filter
 def jsonify(o):
-    return mark_safe(json.dumps(o))
+    return json.dumps(o)
diff --git a/api/base/settings/local-ci.py b/api/base/settings/local-ci.py
@@ -5,7 +5,7 @@
 ENABLE_VARNISH = True
 ENABLE_ESI = False
 
-OSF_DB_PASSWORD = 'postgres'
+OSF_DB_PASSWORD = os.environ.get('OSF_DB_PASSWORD')
 
 SESSION_ENGINE = 'django.contrib.sessions.backends.db'
 

diff --git a/website/settings/local-ci.py b/website/settings/local-ci.py
@@ -10,7 +10,7 @@
 import os
 
 DB_PORT = 5432
-OSF_DB_PASSWORD = 'postgres'
+OSF_DB_PASSWORD = os.environ.get('OSF_DB_PASSWORD')
 
 DEV_MODE = True
 DEBUG_MODE = True  # Sets app to debug mode, turns off template caching, etc.