Merge pull request #4078 from GSA-TTS/main

GSA-TTS · Jul 12, 2024 · 9cd2072 · 9cd2072
2 parents 8b8d57b + d769034
commit 9cd2072
Show file tree

Hide file tree

Showing 90 changed files with 399 additions and 13,483 deletions.
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -39,7 +39,7 @@ jobs:
         run: docker build -t ${{ env.DOCKER_NAME }}:${{ steps.date.outputs.date }} .
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.23.0
+        uses: aquasecurity/trivy-action@0.24.0
         with:
           image-ref: '${{ env.DOCKER_NAME }}:${{ steps.date.outputs.date }}'
           scan-type: 'image'
@@ -74,7 +74,7 @@ jobs:
         run: docker pull ${{ matrix.image.name }}
 
       - name: Run Trivy vulnerability scanner on Third Party Images
-        uses: aquasecurity/trivy-action@0.23.0
+        uses: aquasecurity/trivy-action@0.24.0
         with:
           image-ref: '${{ matrix.image.name }}'
           scan-type: 'image'

diff --git a/backend/config/settings.py b/backend/config/settings.py
@@ -126,7 +126,6 @@
     "api",
     "users",
     "report_submission",
-    # "data_distro",
     "dissemination",
     "census_historical_migration",
     "support",

diff --git a/backend/data_distro/Data migration notes.txt b/backend/data_distro/Data migration notes.txt
diff --git a/backend/data_distro/__init__.py b/backend/data_distro/__init__.py
diff --git a/backend/data_distro/admin.py b/backend/data_distro/admin.py
diff --git a/backend/data_distro/api_views/basic_views.sql b/backend/data_distro/api_views/basic_views.sql
diff --git a/backend/data_distro/api_views/findings.sql b/backend/data_distro/api_views/findings.sql
diff --git a/backend/data_distro/api_views/general.sql b/backend/data_distro/api_views/general.sql
diff --git a/backend/data_distro/api_views/sql_migrations/001_initial_migration.sql b/backend/data_distro/api_views/sql_migrations/001_initial_migration.sql