Merge branch 'main' into EL-1452-remove-feature-flag-and-redundant-code

ministryofjustice · Jul 15, 2024 · 2f269f7 · 2f269f7
2 parents 61861bd + 4baa8b8
commit 2f269f7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -266,7 +266,7 @@ workflows:
          context: laa-fala
 
       - deploy_with_helm:
-          name: UAT Ephemeral deploy
+          name: Deploy UAT branch
           environment: staging
           requires:
             - build
@@ -278,6 +278,10 @@ workflows:
           type: approval
           requires:
             - playwright
+          filters:
+            branches:
+              only:
+                - main
 
       - deploy:
           name: Legacy staging deploy
@@ -287,6 +291,10 @@ workflows:
           context:
             - laa-fala
             - laa-fala-live-staging
+          filters:
+            branches:
+              only:
+                - main
 
       - deploy_with_helm:
           name: Helm Staging Deploy
@@ -305,6 +313,10 @@ workflows:
           name: deploy_grafana
           requires:
             - staging_deploy_approval
+          filters:
+            branches:
+              only:
+                - main
           context:
             - laa-fala
             - laa-fala-live-staging

diff --git a/requirements/generated/requirements-dev.txt b/requirements/generated/requirements-dev.txt
@@ -24,7 +24,7 @@ click==8.1.7
     # via pip-tools
 distlib==0.3.8
     # via virtualenv
-django==5.0.6
+django==5.0.7
     # via
     #   -r requirements/source/requirements-base.in
     #   django-csp

diff --git a/requirements/generated/requirements-production.txt b/requirements/generated/requirements-production.txt
@@ -14,7 +14,7 @@ charset-normalizer==3.3.2
     # via requests
 cla-common @ https://github.com/ministryofjustice/cla_common/archive/refs/tags/0.3.3.tar.gz
     # via -r requirements/source/requirements-base.in
-django==5.0.6
+django==5.0.7
     # via
     #   -r requirements/source/requirements-base.in
     #   django-csp