Code

Sync Upstream#5

Code

Merged

bingxin666 merged 47 commits intoBakaAC:mainBakaAC/mastodon:mainfrom TheEssem:mainTheEssem/mastodon:mainCopy head branch name to clipboardJan 29, 2025

+2,963-1,213

Commits

Commits on Jan 23, 2025

• Convert LanguageDropdown to a functional component (mastodon#33701)

  ClearlyClaire

  authored
  db14604

  Copy full SHA for db14604

• Add information about alt text to alt text modal in web UI (mastodon#33702)

  Gargron

  authored
  0885c31

  Copy full SHA for 0885c31

• Fix intermittent services/ap/process_status_update tags failure (mastodon#33695)

  mjankowski

  authored
  51ecc73

  Copy full SHA for 51ecc73

• New Crowdin Translations (automated) (mastodon#33697)

  Show description for 1b2c952
  

  github-actions[bot]

  and

  web-flow

  authored
  1b2c952

  Copy full SHA for 1b2c952

• Change “Prohibited uses” section of ToS template according to feedback (mastodon#33703)

  ClearlyClaire

  authored
  ffaf458

  Copy full SHA for ffaf458

• Remove broken link to Terms of Service when none are defined (mastodon#33699)

  ClearlyClaire

  authored
  4b4de02

  Copy full SHA for 4b4de02

• Fix LDSignature tests (mastodon#33705)

  ClearlyClaire

  authored
  7261951

  Copy full SHA for 7261951

Commits on Jan 24, 2025

• Store Bootsnap cache outside bind mounts (devcontainer only) (mastodon#33677)

  c960657

  authored
  5c50d89

  Copy full SHA for 5c50d89

• New Crowdin Translations (automated) (mastodon#33711)

  Show description for e44b784
  

  github-actions[bot]

  and

  web-flow

  authored
  e44b784

  Copy full SHA for e44b784

• Use expect params wrapper for more "auth" and "2FA" "controllers" (mastodon#33717)

  mjankowski

  authored
  a1d9c3f

  Copy full SHA for a1d9c3f

• Convert LanguageDropdownMenu to functional component (mastodon#33704)

  ClearlyClaire

  authored
  9a0166c

  Copy full SHA for 9a0166c

• Update babel monorepo to v7.26.7 (mastodon#33721)

  Show description for 469c8f8
  renovate[bot]

  authored
  469c8f8

  Copy full SHA for 469c8f8

• Fix Style/HashSlice cop violations (mastodon#33720)

  mjankowski

  authored
  f73df1f

  Copy full SHA for f73df1f

• Update dependency react-select to v5.10.0 (mastodon#33722)

  Show description for 79cbb61
  renovate[bot]

  authored
  79cbb61

  Copy full SHA for 79cbb61

• Fix wrong styles on rules and buttons in the sign-up form (mastodon#33725)

  Gargron

  authored
  2df86d6

  Copy full SHA for 2df86d6

Commits on Jan 27, 2025

• Refactor <LanguageDropdown> into TypeScript (mastodon#33723)

  Gargron

  authored
  52a5c8a

  Copy full SHA for 52a5c8a

• Fix color of language indicator in light theme in web UI (mastodon#33724)

  Gargron

  authored
  81271a1

  Copy full SHA for 81271a1

• Remove system tooltip for alt text in web UI (mastodon#33736)

  Gargron

  authored
  9568733

  Copy full SHA for 9568733

• Fix documentation URL (mastodon#33728)

  mikkelricky

  authored
  2bfcda1

  Copy full SHA for 2bfcda1

• New Crowdin Translations (automated) (mastodon#33731)

  Show description for b53bf23
  

  github-actions[bot]

  and

  web-flow

  authored
  b53bf23

  Copy full SHA for b53bf23

• Update formatjs monorepo (mastodon#33656)

  Show description for f8f3182
  renovate[bot]

  authored
  f8f3182

  Copy full SHA for f8f3182

• Update dependency ox to v2.14.21 (mastodon#33740)

  Show description for df63470
  renovate[bot]

  authored
  df63470

  Copy full SHA for df63470

• Update dependency @reduxjs/toolkit to v2.5.1 (mastodon#33739)

  Show description for b868e30
  renovate[bot]

  authored
  b868e30

  Copy full SHA for b868e30

• Add an optional metric exporter (mastodon#33734)

  renchap

  authored
  5938428

  Copy full SHA for 5938428

• Use expect for admin/ controllers (mastodon#33686)

  mjankowski

  authored
  65d9171

  Copy full SHA for 65d9171

• Use expect in Admin::ExportControllerConcern import params (mastodon#33745)

  mjankowski

  authored
  d3b637c

  Copy full SHA for d3b637c

• Add hover cards to follow suggestions (mastodon#33749)

  ClearlyClaire

  authored
  e973351

  Copy full SHA for e973351

• Fix error in TwoFactorPamAuthenticatable when handling invalid params (mastodon#33746)

  ClearlyClaire

  authored
  ea743d6

  Copy full SHA for ea743d6

• Use expect in remaining controller locations (mastodon#33748)

  mjankowski

  authored
  93f3c72

  Copy full SHA for 93f3c72

• Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream

  Show description for fcc5262
  ClearlyClaire

  committed
  fcc5262

  Copy full SHA for fcc5262

• [Glitch] Convert LanguageDropdown to a functional component

  Show description for c14c553
  ClearlyClaire

  committed
  c14c553

  Copy full SHA for c14c553

• [Glitch] Add information about alt text to alt text modal in web UI

  Show description for 17af994
  

  Gargron

  authored and

  ClearlyClaire

  committed
  17af994

  Copy full SHA for 17af994

• [Glitch] Convert LanguageDropdownMenu to functional component

  Show description for 75e304d
  ClearlyClaire

  committed
  75e304d

  Copy full SHA for 75e304d

• [Glitch] Refactor <LanguageDropdown> into TypeScript

  Show description for 12bdf58
  

  Gargron

  authored and

  ClearlyClaire

  committed
  12bdf58

  Copy full SHA for 12bdf58

• [Glitch] Fix color of language indicator in light theme in web UI

  Show description for a21f357
  

  Gargron

  authored and

  ClearlyClaire

  committed
  a21f357

  Copy full SHA for a21f357

• [Glitch] Remove system tooltip for alt text in web UI

  Show description for 560eaff
  

  Gargron

  authored and

  ClearlyClaire

  committed
  560eaff

  Copy full SHA for 560eaff

• [Glitch] Add hover cards to follow suggestions

  Show description for e736363
  ClearlyClaire

  committed
  e736363

  Copy full SHA for e736363

Commits on Jan 28, 2025

• Reduce factory creation across controllers/admin specs (mastodon#33752)

  mjankowski

  authored
  8a2d764

  Copy full SHA for 8a2d764

• Fix parameter validation in our custom devise strategies (mastodon#33754)

  ClearlyClaire

  authored
  6646a0a

  Copy full SHA for 6646a0a

• Update RuboCop (non-major) to v1.71.0 (mastodon#33644)

  Show description for 0091459
  renovate[bot]

  authored
  0091459

  Copy full SHA for 0091459

• New Crowdin Translations (automated) (mastodon#33753)

  Show description for 80f72ee
  

  github-actions[bot]

  and

  web-flow

  authored
  80f72ee

  Copy full SHA for 80f72ee

• Fix polls not being validated on edition (mastodon#33755)

  ClearlyClaire

  authored
  32aa83e

  Copy full SHA for 32aa83e

• Fix incorrect signature after HTTP redirect (mastodon#33757)

  ClearlyClaire

  authored
  5b291fc

  Copy full SHA for 5b291fc

• Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream

  Show description for 353e5f7
  ClearlyClaire

  committed
  353e5f7

  Copy full SHA for 353e5f7

• Merge pull request glitch-soc#2955 from ClearlyClaire/glitch-soc/merge-upstream

  Show description for 6be5a8d
  ClearlyClaire

  authored
  6be5a8d

  Copy full SHA for 6be5a8d

• Sync Glitch follow button with Mastodon (glitch-soc#2957)

  Show description for b740b17
  wackbyte

  authored
  b740b17

  Copy full SHA for b740b17

Commits on Jan 29, 2025

• Merge remote-tracking branch 'upstream/main'

  TheEssem

  committed
  da674a0

  Copy full SHA for da674a0