chore: Allow websockets and collaboration service to run in the same process (#2674)

2021-10-19 21:18:20 -07:00
parent 3610a7f4a2
commit d443abfc57
11 changed files with 67 additions and 76 deletions
--- a/app/components/Sidebar/Settings.js
+++ b/app/components/Sidebar/Settings.js
@@ -96,15 +96,13 @@ function SettingsSidebar() {
                label={t("Security")}
              />
            )}
-            {can.update &&
-              env.COLLABORATION_URL &&
-              env.DEPLOYMENT !== "hosted" && (
-                <SidebarLink
-                  to="/settings/features"
-                  icon={<BeakerIcon color="currentColor" />}
-                  label={t("Features")}
-                />
-              )}
+            {can.update && env.DEPLOYMENT !== "hosted" && (
+              <SidebarLink
+                to="/settings/features"
+                icon={<BeakerIcon color="currentColor" />}
+                label={t("Features")}
+              />
+            )}
            <SidebarLink
              to="/settings/members"
              icon={<UserIcon color="currentColor" />}