From b7f0408623b78cfcce2c354ecd00e8f67bb6b649 Mon Sep 17 00:00:00 2001
From: Geoffrey Huntley <ghuntley@ghuntley.com>
Date: Wed, 28 Jul 2021 01:02:12 +0000
Subject: [PATCH 1/2] feat(gitpod): adjust community links

---
 extensions/gitpod/package.json     | 20 ++++++++++++++------
 extensions/gitpod/package.nls.json |  5 +++--
 extensions/gitpod/src/extension.ts |  7 +++++--
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/extensions/gitpod/package.json b/extensions/gitpod/package.json
index 972c3522e6bf1..2c13262693e00 100644
--- a/extensions/gitpod/package.json
+++ b/extensions/gitpod/package.json
@@ -49,12 +49,16 @@
         "title": "%openDocumentation%"
       },
       {
-        "command": "gitpod.open.follow",
-        "title": "%openFollow%"
+        "command": "gitpod.open.twitter",
+        "title": "%openTwitter%"
       },
       {
-        "command": "gitpod.open.community",
-        "title": "%openCommunity%"
+        "command": "gitpod.open.discord",
+        "title": "%openDiscord%"
+      },
+      {
+        "command": "gitpod.open.discourse",
+        "title": "%openDiscourse%"
       },
       {
         "command": "gitpod.reportIssue",
@@ -231,11 +235,15 @@
           "group": "remote_00_gitpod_navigation@60"
         },
         {
-          "command": "gitpod.open.follow",
+          "command": "gitpod.open.twitter",
           "group": "remote_00_gitpod_navigation@70"
         },
         {
-          "command": "gitpod.open.community",
+          "command": "gitpod.open.discord",
+          "group": "remote_00_gitpod_navigation@80"
+        },
+        {
+          "command": "gitpod.open.discourse",
           "group": "remote_00_gitpod_navigation@80"
         },
         {
diff --git a/extensions/gitpod/package.nls.json b/extensions/gitpod/package.nls.json
index 09d94eb7a94f5..52ab890b4e6e5 100644
--- a/extensions/gitpod/package.nls.json
+++ b/extensions/gitpod/package.nls.json
@@ -6,8 +6,9 @@
 	"openSettings": "Gitpod: Open Settings",
 	"openContext": "Gitpod: Open Context",
 	"openDocumentation": "Gitpod: Documentation",
-	"openCommunity": "Gitpod: Open Community Forum",
-	"openFollow": "Gitpod: Follow us on Twitter",
+	"openDiscord": "Gitpod: Open Community Chat",
+	"openDiscourse": "Gitpod: Open Community Forum",
+	"openTwitter": "Gitpod: Follow us on Twitter",
 	"reportIssue": "Gitpod: Report Issue",
 	"stopWorkspace": "Gitpod: Stop Workspace",
 	"upgradeSubscription": "Gitpod: Upgrade Subscription",
diff --git a/extensions/gitpod/src/extension.ts b/extensions/gitpod/src/extension.ts
index 9cb97c17d96b9..d0996cfe508d0 100644
--- a/extensions/gitpod/src/extension.ts
+++ b/extensions/gitpod/src/extension.ts
@@ -165,10 +165,13 @@ export async function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(vscode.commands.registerCommand('gitpod.open.documentation', () =>
 		vscode.env.openExternal(vscode.Uri.parse('https://www.gitpod.io/docs'))
 	));
-	context.subscriptions.push(vscode.commands.registerCommand('gitpod.open.community', () =>
+	context.subscriptions.push(vscode.commands.registerCommand('gitpod.open.discord', () =>
+		vscode.env.openExternal(vscode.Uri.parse('https://www.gitpod.io/chat'))
+	));
+	context.subscriptions.push(vscode.commands.registerCommand('gitpod.open.discourse', () =>
 		vscode.env.openExternal(vscode.Uri.parse('https://community.gitpod.io'))
 	));
-	context.subscriptions.push(vscode.commands.registerCommand('gitpod.open.follow', () =>
+	context.subscriptions.push(vscode.commands.registerCommand('gitpod.open.twitter', () =>
 		vscode.env.openExternal(vscode.Uri.parse('https://twitter.com/gitpod'))
 	));
 	context.subscriptions.push(vscode.commands.registerCommand('gitpod.reportIssue', () =>

From 26de824fb2350ffa12eeac7c7563be913b153abf Mon Sep 17 00:00:00 2001
From: Geoffrey Huntley <ghuntley@ghuntley.com>
Date: Wed, 4 Aug 2021 08:01:40 +0000
Subject: [PATCH 2/2] feat(gitpod): add help menu links

---
 extensions/gitpod/package.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/extensions/gitpod/package.json b/extensions/gitpod/package.json
index 2c13262693e00..d765bf375b21e 100644
--- a/extensions/gitpod/package.json
+++ b/extensions/gitpod/package.json
@@ -196,11 +196,15 @@
       ],
       "menuBar/help": [
         {
-          "command": "gitpod.open.follow",
+          "command": "gitpod.open.openTwitter",
           "group": "z_about2@10"
         },
         {
-          "command": "gitpod.open.community",
+          "command": "gitpod.open.openDiscord",
+          "group": "z_about2@20"
+        },
+        {
+          "command": "gitpod.open.openDiscourse",
           "group": "z_about2@20"
         },
         {