Merge branch 'develop' into florianduros/rip-out-legacy-crypto/migrate-EventTile-isRoomEncrypted

2024-11-28 11:28:12 +08:00 · 2024-11-21 16:23:45 +01:00 · 2024-11-21 16:23:45 +01:00 · 45596d71a2
commit 45596d71a2
parent dc53178ea6 eddaf7c47e
9 changed files with 12 additions and 9 deletions
--- a/.github/labels.yml
+++ b/.github/labels.yml
@ -232,6 +232,9 @@
 - name: "Z-Flaky-Test"
  description: "A test is raising false alarms"
  color: "ededed"
+- name: "Z-Flaky-Jest-Test"
+  description: "A Jest test is raising false alarms"
+  color: "ededed"
 - name: "Z-FOSDEM"
  description: "Issues in chat.fosdem.org"
  color: "ededed"
--- a/playwright/snapshots/register/email.spec.ts/registration-check-your-email-linux.png
+++ b/playwright/snapshots/register/email.spec.ts/registration-check-your-email-linux.png
--- a/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png
+++ b/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png
--- a/playwright/snapshots/register/register.spec.ts/registration-linux.png
+++ b/playwright/snapshots/register/register.spec.ts/registration-linux.png
--- a/playwright/snapshots/register/register.spec.ts/terms-prompt-linux.png
+++ b/playwright/snapshots/register/register.spec.ts/terms-prompt-linux.png
--- a/src/components/views/auth/AuthFooter.tsx
+++ b/src/components/views/auth/AuthFooter.tsx
@ -16,7 +16,7 @@ const AuthFooter = (): ReactElement => {
    const brandingConfig = SdkConfig.getObject("branding");
    const links = brandingConfig?.get("auth_footer_links") ?? [
        { text: "Blog", url: "https://element.io/blog" },
-        { text: "Twitter", url: "https://twitter.com/element_hq" },
+        { text: "Mastodon", url: "https://mastodon.matrix.org/@Element" },
        { text: "GitHub", url: "https://github.com/element-hq/element-web" },
    ];

--- a/test/unit-tests/components/structures/snapshots/MatrixChat-test.tsx.snap
+++ b/test/unit-tests/components/structures/snapshots/MatrixChat-test.tsx.snap
@ -180,11 +180,11 @@ exports[`<MatrixChat /> Multi-tab lockout waits for other tab to stop during sta
        Blog
      </a>
      <a
-        href="https://twitter.com/element_hq"
+        href="https://mastodon.matrix.org/@Element"
        rel="noreferrer noopener"
        target="_blank"
      >
-        Twitter
+        Mastodon
      </a>
      <a
        href="https://github.com/element-hq/element-web"
@ -357,11 +357,11 @@ exports[`<MatrixChat /> with a soft-logged-out session should show the soft-logo
        Blog
      </a>
      <a
-        href="https://twitter.com/element_hq"
+        href="https://mastodon.matrix.org/@Element"
        rel="noreferrer noopener"
        target="_blank"
      >
-        Twitter
+        Mastodon
      </a>
      <a
        href="https://github.com/element-hq/element-web"
--- a/test/unit-tests/components/views/auth/snapshots/AuthFooter-test.tsx.snap
+++ b/test/unit-tests/components/views/auth/snapshots/AuthFooter-test.tsx.snap
@ -14,11 +14,11 @@ exports[`<AuthFooter /> should match snapshot 1`] = `
      Blog
    </a>
    <a
-      href="https://twitter.com/element_hq"
+      href="https://mastodon.matrix.org/@Element"
      rel="noreferrer noopener"
      target="_blank"
    >
-      Twitter
+      Mastodon
    </a>
    <a
      href="https://github.com/element-hq/element-web"
--- a/test/unit-tests/components/views/auth/snapshots/AuthPage-test.tsx.snap
+++ b/test/unit-tests/components/views/auth/snapshots/AuthPage-test.tsx.snap
@ -30,11 +30,11 @@ exports[`<AuthPage /> should match snapshot 1`] = `
        Blog
      </a>
      <a
-        href="https://twitter.com/element_hq"
+        href="https://mastodon.matrix.org/@Element"
        rel="noreferrer noopener"
        target="_blank"
      >
-        Twitter
+        Mastodon
      </a>
      <a
        href="https://github.com/element-hq/element-web"