Merge branch 'main' into colinmegill/#2036-geneset-summary-histo

.github/workflows/scale-test.yml

@@ -15,15 +15,15 @@ jobs:
           python-version: 3.7
       - name: Install dependencies
         run: |
-          pip install -r backend/czi_hosted/test/locust/requirements-locust.txt
+          pip install -r backend/test/test_czi_hosted/locust/requirements-locust.txt
       - name: Dev Scale Test
         run: |
-          locust -f backend/czi_hosted/test/locust/locustfile.py --headless -u 30 -r 10 --host https://api.cellxgene.dev.single-cell.czi.technology/cellxgene/e/ --run-time 5m 2>&1 | tee locust_dev_stats.txt
+          locust -f backend/test/test_czi_hosted/locust/locustfile.py --headless -u 30 -r 10 --host https://api.cellxgene.dev.single-cell.czi.technology/cellxgene/e/ --run-time 5m 2>&1 | tee locust_dev_stats.txt
       - name: Slack success webhook
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
         run: |
-          DEV_STATS=$(tail -n 61 locust_dev_stats.txt)
+          DEV_STATS=$(tail -n 15 locust_dev_stats.txt)
           DEV_MSG="\`\`\`CELLXGENE EXPLORER DEV SCALE TEST RESULTS: ${DEV_STATS}\`\`\`"
           curl -X POST -H 'Content-type: application/json' --data "{'text':'${DEV_MSG}'}" $SLACK_WEBHOOK
 

backend/test/test_czi_hosted/locust/requirements-locust.txt

@@ -1,2 +1,2 @@
 locust
--r ../../requirements.txt
+-r ../../../czi_hosted/requirements.txt

client/src/components/termsPrompt/index.js

@@ -67,7 +67,7 @@ class TermsPrompt extends React.PureComponent {
           target="_blank"
           rel="noopener"
         >
-          terms of service (updates coming)
+          terms of service
         </a>
         .{" "}
       </span>
@@ -89,7 +89,7 @@ class TermsPrompt extends React.PureComponent {
           target="_blank"
           rel="noopener"
         >
-          privacy policy (updates coming)
+          privacy policy
         </a>
         .&nbsp;
       </span>