Merge branch 'main' into 1155-remove-validation-on-creating-students-and-inviting-teachers

Author: mwtrew

docker-compose.yml

@@ -26,7 +26,7 @@ services:
         condition: service_healthy
     volumes:
       - .:/app
-      - bundle-data:/usr/local/bundle
+      - bundle-data-v2:/usr/local/bundle
       - node_modules:/app/node_modules
       # This is here to avoid rails finding stale pid-files in tmp/pids and then
       # thinking it is already running:
@@ -55,5 +55,5 @@ services:
 
 volumes:
   postgres-data:
-  bundle-data:
+  bundle-data-v2:
   node_modules: