From 23f4053ff26e17570fead42f763c2423f5975887 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 12 Jan 2024 12:30:23 -0600 Subject: [PATCH] Replace expired Slack invite with Fleet website slack redirect (#15747) Related to: https://github.com/fleetdm/fleet/issues/15089 Changes: - Replaced the expired osquery Slack invitation with a link to the Fleet website's `/slack` redirect. --------- Co-authored-by: Mike McNeil --- .github/ISSUE_TEMPLATE/config.yml | 4 ++-- frontend/pages/errors/Fleet404/Fleet404.tsx | 2 +- frontend/pages/errors/Fleet500/Fleet500.tsx | 2 +- handbook/company/communications.md | 2 +- server/mail/templates/change_email_confirmation.html | 2 +- server/mail/templates/invite_token.html | 2 +- server/mail/templates/password_reset.html | 2 +- server/mail/templates/smtp_setup.html | 2 +- website/config/routes.js | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3e9d1b0ab94c..2fd9c4dbdc43 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - - name: Chat with other developers - url: https://osquery.slack.com/join/shared_invite/zt-h29zm0gk-s2DBtGUTW4CFel0f0IjTEw#/ + - name: Chat with other users + url: https://fleetdm.com/support about: Please ask and answer questions here. - name: Documentation url: https://fleetdm.com/documentation diff --git a/frontend/pages/errors/Fleet404/Fleet404.tsx b/frontend/pages/errors/Fleet404/Fleet404.tsx index e2adec17bd12..b05d346369f1 100644 --- a/frontend/pages/errors/Fleet404/Fleet404.tsx +++ b/frontend/pages/errors/Fleet404/Fleet404.tsx @@ -39,7 +39,7 @@ const Fleet404 = () => (

diff --git a/frontend/pages/errors/Fleet500/Fleet500.tsx b/frontend/pages/errors/Fleet500/Fleet500.tsx index 1d6b2aff4c72..46076c3be8bd 100644 --- a/frontend/pages/errors/Fleet500/Fleet500.tsx +++ b/frontend/pages/errors/Fleet500/Fleet500.tsx @@ -36,7 +36,7 @@ const Fleet500 = () => (

Please file an issue if you believe this is a bug.

diff --git a/handbook/company/communications.md b/handbook/company/communications.md index b51caa7fc91d..b9ab1ce4e252 100644 --- a/handbook/company/communications.md +++ b/handbook/company/communications.md @@ -1369,7 +1369,7 @@ TODO: Document. #### Tracking -When responding to a question or issue in the [#fleet](https://osquery.slack.com/join/shared_invite/zt-h29zm0gk-s2DBtGUTW4CFel0f0IjTEw#/) channel of the osquery Slack workspace, push the thread to Zapier using the `TODO: Update docs` Zap. This will add information about the thread to the [Slack Questions Spreadsheet](https://docs.google.com/spreadsheets/d/15AgmjlnV4oRW5m94N5q7DjeBBix8MANV9XLWRktMDGE/edit#gid=336721544). In the `Notes` field, you can include any information that you think will be helpful when making weekly doc updates. That may be something like +When responding to a question or issue in the [#fleet channel of the osquery Slack workspace](https://fleetdm.com/slack), push the thread to Zapier using the `TODO: Update docs` Zap. This will add information about the thread to the [Slack Questions Spreadsheet](https://docs.google.com/spreadsheets/d/15AgmjlnV4oRW5m94N5q7DjeBBix8MANV9XLWRktMDGE/edit#gid=336721544). In the `Notes` field, you can include any information that you think will be helpful when making weekly doc updates. That may be something like - proposed change to the documentation. - documentation link that was sent as a response. diff --git a/server/mail/templates/change_email_confirmation.html b/server/mail/templates/change_email_confirmation.html index 2c1656fe8f12..37aa99226009 100644 --- a/server/mail/templates/change_email_confirmation.html +++ b/server/mail/templates/change_email_confirmation.html @@ -151,7 +151,7 @@

Confirm your updated email address

/> You have been invited to Fleet! /> Reset your Fleet password /> Fleet SMTP setup confirmed />