Merge branch 'main' into cfd-x-forwarded-for

Katie Horne · Katie Horne · commit ef9886f57177 · 2022-03-14T12:49:11.000-05:00
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -19,40 +19,12 @@ permissions:
   security-events: none
   statuses: none
 
-# Cancel in-progress runs for pull requests when developers push
-# additional changes, and serialize builds in branches.
-# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 jobs:
   production:
     name: Production
     runs-on: ubuntu-20.04
     steps:
-      - name: Checkout m
-        uses: actions/checkout@v3
-        with:
-          repository: cdr/m
-          ref: refs/heads/master
-          token: ${{ secrets.GH_ACCESS_TOKEN }}
-          submodules: true
-          fetch-depth: 0
+      - uses: actions/checkout@v3
 
       - name: Deploy to Vercel (Production)
-        env:
-          VERCEL_ORG_ID: team_tGkWfhEGGelkkqUUm9nXq17r
-          VERCEL_PROJECT_ID: QmZRucMRh3GFk1817ZgXjRVuw5fhTspHPHKct3JNQDEPGd
-          VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
-          VERCEL_PROD: true
-        run: ./ci/scripts/deploy_vercel.sh
-
-      - name: Slack alert on CI failure
-        uses: 8398a7/action-slack@v3
-        if: failure() && github.ref == 'refs/heads/master'
-        with:
-          status: ${{ job.status }}
-          fields: repo,message,author,workflow,action,eventName
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        run: curl -X POST https://api.vercel.com/v1/integrations/deploy/prj_vLDYhOxLmchIKn4wYKStFlglaji2/IohYnGbnwu
diff --git a/assets/guides/hosted-beta/infrastructure_diagram.png b/assets/guides/hosted-beta/infrastructure_diagram.png
diff --git a/guides/hosted-beta/index.md b/guides/hosted-beta/index.md
diff --git a/guides/troubleshooting/activate-jetbrains-licensing.md b/guides/troubleshooting/activate-jetbrains-licensing.md
@@ -68,8 +68,8 @@ clipboard.
 ## Paste the IDE authentication token
 
 Paste the IDE authentication token back into your already opened JetBrains IDE
-window. If on a Mac, you must type CMD + v followed by Control + v for the paste
-operation to work correctly.
+window. Type **Command + v** (macOS) or **Control + v** (Linux/Windows) for the
+paste operation to work correctly.
 
 ![Paste the token](../../assets/workspaces/7-cmd-v-ctrl-v-auth-token.png)
 
diff --git a/manifest.json b/manifest.json
@@ -494,9 +494,6 @@
             }
           ]
         },
-        {
-          "path": "./guides/hosted-beta/index.md"
-        },
         {
           "path": "./guides/mobile-development/index.md"
         },
diff --git a/setup/index.md b/setup/index.md
@@ -29,9 +29,6 @@ deployment steps.
    [Kubernetes cluster](kubernetes/index.md) and
    [installing Coder](installation.md).
 
-   > If you're participating in our hosted beta, please see
-   > [our guide for how to get started](../guides/hosted-beta/index.md).
-
 ## In this section
 
 <children></children>

Original file line number	Diff line number	Diff line change
`@@ -494,9 +494,6 @@`
`494`	`494`	`}`
`495`	`495`	`]`
`496`	`496`	`},`
`497`		`- {`
`498`		`- "path": "./guides/hosted-beta/index.md"`
`499`		`- },`
`500`	`497`	`{`
`501`	`498`	`"path": "./guides/mobile-development/index.md"`
`502`	`499`	`},`