Merge branch 'main' into enhance/tup-414-help-users-view-all-tickets

TACC · Sep 27, 2023 · 8a801c7 · 8a801c7
2 parents 62ccdca + 33f5270
commit 8a801c7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/apps/tup-cms/Dockerfile b/apps/tup-cms/Dockerfile
@@ -1,5 +1,5 @@
-# TACC/Core-CMS#v3.12.0-beta.3
-FROM taccwma/core-cms:aba079b
+# TACC/Core-CMS#707 (sans commits irrelevant to TACC) (v3.12.0-beta.4 candidate)
+FROM taccwma/core-cms:1f7b95d
 
 WORKDIR /code
 

diff --git a/apps/tup-cms/docker-compose.dev.yml b/apps/tup-cms/docker-compose.dev.yml
@@ -25,7 +25,7 @@ services:
       - tup_cms_net
 
   postgres:
-    image: postgres:11.5
+    image: postgres:14.9
     environment:
       - POSTGRES_PASSWORD=taccforever
       - POSTGRES_USER=postgresadmin

diff --git a/apps/tup-cms/src/apps/user_news/cms_plugins.py b/apps/tup-cms/src/apps/user_news/cms_plugins.py
@@ -3,7 +3,7 @@
 from cms.plugin_pool import plugin_pool
 
 from django.utils.translation import gettext_lazy as _
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str as force_text
 
 from .defaults import max_articles, urls
 from .utils import get_latest_articles

diff --git a/apps/tup-cms/src/taccsite_cms/urls_custom.py b/apps/tup-cms/src/taccsite_cms/urls_custom.py
@@ -1,6 +1,6 @@
 from django.urls import path, include
 
-from django.conf.urls import url
+from django.urls import re_path as url
 from apps.user_news.urls import urls as user_news_urls
 from django.views.generic.base import RedirectView