Merge branch 'main' into windows/collab-2

zed-industries · Jan 31, 2025 · ee0a32b · ee0a32b
2 parents 9229ca4 + 6f46728
commit ee0a32b
Show file tree

Hide file tree

Showing 161 changed files with 5,166 additions and 2,443 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.yml b/.github/ISSUE_TEMPLATE/1_bug_report.yml
@@ -5,10 +5,10 @@ type: "Bug"
 body:
   - type: textarea
     attributes:
-      label: Describe the bug / provide steps to reproduce it
-      description: A one line summary, and detailed reproduction steps
+      label: Summary
+      description: Describe the bug with a one line summary, and provide detailed reproduction steps
       value: |
-        Summary:
+        <!-- Please insert a one line summary of the issue below -->
 
         <!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
         Steps to trigger the problem:

diff --git a/.github/ISSUE_TEMPLATE/2_crash_report.yml b/.github/ISSUE_TEMPLATE/2_crash_report.yml
@@ -4,10 +4,10 @@ type: "Crash"
 body:
   - type: textarea
     attributes:
-      label: Describe the bug / provide steps to reproduce it
-      description: A one line summary, and detailed reproduction steps
+      label: Summary
+      description: Describe the bug with a one line summary, and provide detailed reproduction steps
       value: |
-        Summary:
+        <!-- Please insert a one line summary of the issue below -->
 
         <!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
         Steps to trigger the problem:

diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
@@ -10,7 +10,7 @@ runs:
         cargo install cargo-nextest --locked
 
     - name: Install Node
-      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
       with:
         node-version: "18"
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -283,7 +283,7 @@ jobs:
       DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
     steps:
       - name: Install Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: "18"
 

diff --git a/.github/workflows/community_release_actions.yml b/.github/workflows/community_release_actions.yml
@@ -29,8 +29,7 @@ jobs:
           maxLength: 2000
           truncationSymbol: "..."
       - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@86dc739f3f165f16dadc5666051c367efa1692f4 # v6.0.0
+        uses: tsickert/discord-webhook@c840d45a03a323fbc3f7507ac7769dbd91bfb164 # v5.3.0
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
           content: ${{ steps.get-content.outputs.string }}
-          flags: 4 # suppress embeds - https://discord.com/developers/docs/resources/message#message-object-message-flags
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -22,7 +22,7 @@ jobs:
           version: 9
 
       - name: Setup Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: "20"
           cache: "pnpm"

diff --git a/.github/workflows/randomized_tests.yml b/.github/workflows/randomized_tests.yml
@@ -23,7 +23,7 @@ jobs:
       - buildjet-16vcpu-ubuntu-2204
     steps:
       - name: Install Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: "18"
 

diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
@@ -70,7 +70,7 @@ jobs:
       ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
     steps:
       - name: Install Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: "18"