Merge remote-tracking branch 'origin/bugfix' into dedupe-order-stable-tiebreak

Author: Maffooch

.github/CODEOWNERS

@@ -1,19 +1,4 @@
-# Any kind of package updates only need 2 approvals,
-# So let's add three folks here
-requirements.txt @cneill @mtesauro @Maffooch
-# Any dockerfile or compose changes will need to be viewed by
-# these people
-Dockerfile.* @mtesauro @Maffooch 
-docker-compose.* @mtesauro @Maffooch 
-/docker/ @mtesauro @Maffooch 
 # Documentation changes 
-/docs/content/ @paulOsinski @valentijnscholten @Maffooch
-# Kubernetes should be reviewed by reviewed first by those that know it
-/helm/ @cneill @kiblik @Maffooch
-# Anything UI related needs to be checked out by those with the eye for it
-/dojo/static/ @blakeaowens @Maffooch
-/dojo/templates/ @blakeaowens @Maffooch
-# Any model changes should be closely looked at
-/dojo/models.py @Maffooch
+/docs/content/ @paulOsinski @Maffooch
 # All other code changes should be reviewed by someone
-* @Maffooch @mtesauro
+* @Maffooch @blakeaowens

.github/release-drafter.yml

@@ -6,50 +6,65 @@ branches:
 
 categories:
   - title: '💣 Breaking changes'
-    labels:
-      - 'Breaking Changes'
+    when:
+      labels:
+        - 'Breaking Changes'
   - title: '🚩 Changes to `settings.dist.py` / `local_settings.py`'
-    labels:
-      - 'settings_changes'
+    when:
+      labels:
+        - 'settings_changes'
   - title: '🚩 Database migration'
-    labels:
-      - 'New Migration'
+    when:
+      labels:
+        - 'New Migration'
   - title: '🚩 Requires hash code recomputation'
-    labels:
-      - 'hashcode-update-needed'
+    when:
+      labels:
+        - 'hashcode-update-needed'
   - title: '🚩 Security'
-    labels:
-      - 'security'
+    when:
+      labels:
+        - 'security'
   - title: '🚀 New importers'
-    labels:
-      - 'Import Scans'
+    when:
+      labels:
+        - 'Import Scans'
   - title: '🚀 General features and enhancements'
-    labels:
-      - 'feature'
-      - 'enhancement'
-      - 'performance'
+    when:
+      labels:
+        - 'feature'
+        - 'enhancement'
+        - 'performance'
   - title: '🚀 API features and enhancements'
-    label: 'apiv2'
+    when:
+      label: 'apiv2'
   - title: '🐛 Bug Fixes'
-    labels:
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
+    when:
+      labels:
+        - 'fix'
+        - 'bugfix'
+        - 'bug'
   - title: 📝 Documentation updates
-    label: 'documentation'
+    when:
+      label: 'documentation'
   - title: '🖌 Updates in UI'
-    label: 'ui'
+    when:
+      label: 'ui'
   - title: '🗣 Updates in localization'
-    label: 'localization'
+    when:
+      label: 'localization'
   - title: '🔧 Improved code quality with linters'
-    label: 'lint'
+    when:
+      label: 'lint'
   - title: '⚙️ Improvemets of GitHub Actions'
-    label: 'gha'
+    when:
+      label: 'gha'
   - title: '🧰 Maintenance'
     collapse-after: 3
-    labels:
-      - 'dependencies'
-      - 'maintenance'
+    when:
+      labels:
+        - 'dependencies'
+        - 'maintenance'
 exclude-labels:
   - 'skip-changelog'
 

.github/workflows/fetch-oas.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
-          ref: release/${{ env.release_version }}
+          ref: ${{ env.release_version }}
 
       - name: Load docker images
         run: |-

docker/entrypoint-first-boot.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # called from entrypoint-initializer.sh when no admin user exists (first boot)
-cat <<EOD | python manage.py shell
+cat <<EOD | python manage.py shell --no-imports
 import os
 from django.contrib.auth.models import User
 User.objects.create_superuser(
@@ -27,8 +27,13 @@ EOD
     python3 manage.py loaddata "${i%.*}"
   done
 
-  echo "Installing watson search index"
-  python3 manage.py installwatson
+  watson_enabled=$(echo "${DD_WATSON_SEARCH_ENABLED:-True}" | tr '[:upper:]' '[:lower:]')
+  if [ "$watson_enabled" != "false" ] && [ "$watson_enabled" != "0" ] && [ "$watson_enabled" != "off" ] && [ "$watson_enabled" != "no" ]; then
+    echo "Installing watson search index"
+    python3 manage.py installwatson
+  else
+    echo "Skipping watson search index (DD_WATSON_SEARCH_ENABLED=${DD_WATSON_SEARCH_ENABLED})"
+  fi
 
   # surveys fixture needs to be modified as it contains an instance dependant polymorphic content id
   echo "Migration of textquestions for surveys"

docker/reach_database.sh

@@ -13,7 +13,7 @@ wait_for_database_to_be_reachable() {
             exit 1
         fi
     done
-    cat <<EOD | python manage.py shell
+    cat <<EOD | python manage.py shell --no-imports
 from django.db import connections
 connections['default'].cursor()
 EOD