Code

Upstream 20240510#741

Code

Merged

kmycode merged 9 commits intokb_developmentkmycode/mastodon:kb_developmentfrom upstream-20240510kmycode/mastodon:upstream-20240510Copy head branch name to clipboardMay 9, 2024

+384-65

Commits

Commits on May 7, 2024

• Fix db:encryption:init requiring ActiveRecord encryption variables to be set (mastodon#30202)

  ClearlyClaire

  authored
  996292c

  Copy full SHA for 996292c

• Revert "Migrate paperclip _file_size columns to bigint (mastodon#29263)" (mastodon#30203)

  ClearlyClaire

  authored
  96fb6e4

  Copy full SHA for 96fb6e4

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

  Show description for ed556db
  

  github-actions[bot]

  and

  web-flow

  authored
  ed556db

  Copy full SHA for ed556db

• Update dependency dotenv to v3.1.2 (mastodon#30197)

  Show description for 8540004
  renovate[bot]

  authored
  8540004

  Copy full SHA for 8540004

• Update dependency aws-sdk-s3 to v1.149.1 (mastodon#30196)

  Show description for 5cd13ee
  renovate[bot]

  authored
  5cd13ee

  Copy full SHA for 5cd13ee

• Update dependency sass to v1.77.0 (mastodon#30200)

  Show description for c9ccba7
  renovate[bot]

  authored
  c9ccba7

  Copy full SHA for c9ccba7

• Ensure custom favicon is converted to PNG and ICO (mastodon#30208)

  ClearlyClaire

  authored
  d8c4284

  Copy full SHA for d8c4284

Commits on May 9, 2024

• Merge remote-tracking branch 'parent/main' into upstream-20240510

  kmycode

  committed
  10eec0e

  Copy full SHA for 10eec0e

• Fix test

  kmycode

  committed
  d7c13bf

  Copy full SHA for d7c13bf