Merge branch 'master' into '853-language-select-is-sometimes-not-shown-due-to-overlengh-in-sidenav'

# Conflicts:
#   CHANGELOG.rst

CHANGELOG.rst

@@ -13,6 +13,7 @@ Fixed
 ~~~~~
 
 * In some cases, some items in the sidenav menu were not shown due to its height being higher than the visible page area.
+* Add permission check to accept invitation menu point in order to hide it when this feature is disabled.
 
 `3.0`_ - 2022-05-11
 -------------------

aleksis/core/frontend/routes.js

@@ -54,6 +54,7 @@ const routes = [
       icon: "mdi-key-outline",
       titleKey: "accounts.invitation.accept_invitation.menu_title",
       validators: [notLoggedInValidator],
+      permission: "core.invite_enabled",
     },
   },
   {
@@ -956,14 +957,6 @@ const routes = [
       invalidate: "leave",
     },
   },
-  {
-    path: "/invitations/code/enter",
-    component: () => import("./components/LegacyBaseTemplate.vue"),
-    props: {
-      byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
-    },
-    name: "core.enter_invitation_code",
-  },
   {
     path: "/invitations/code/generate",
     component: () => import("./components/LegacyBaseTemplate.vue"),