Merge branch 'canary' into np_pr

vercel · May 17, 2024 · c5ef652 · c5ef652
2 parents 6cc0af6 + 168d125
commit c5ef652
Show file tree

Hide file tree

Showing 451 changed files with 14,085 additions and 5,107 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -7,3 +7,6 @@
 
 # chore: update prettier to 3.2.5 (#65092)
 64b718c6618b6c419872abbf22163ae543ac259e
+
+# Replace createNextDescribe with nextTestSetup
+c6320ed87ab41eee6f3ac54352ad02a239f329b2
diff --git a/.github/workflows/retry_test.yml b/.github/workflows/retry_test.yml
@@ -42,7 +42,7 @@ jobs:
           # (through slightly hacky means).
           payload: |
             {
-              "commit_title": "${{ github.event.workflow_run.display_title }}",
+              "commit_title": ${{ toJSON(github.event.workflow_run.display_title) }},
               "commit_url": "github.com/${{ github.repository }}/commit/${{ github.event.workflow_run.head_sha }}",
               "workflow_run_url": "github.com/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}/attempts/${{ github.event.workflow_run.run_attempt }}"
             }

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -77,5 +77,9 @@
       "scheme": "file"
     }
   ],
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "gitlens.advanced.blame.customArguments": [
+    "--ignore-revs-file",
+    "${workspaceRoot}/.git-blame-ignore-revs"
+  ]
 }