Merge upstream up to a15139bc02d279b9ef85e95990f41e3e88838d20

[polyamAdmin]

:warning: Includes db migrations Requires running RAILS_ENV=production bundle exec rails db:encryption:init which outputs values for the following env vars:

• ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
• ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
• ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT

These have to be added to .env.production before running migrations

:warning: Dropped support for Ruby 3.0

Merge upstream up to 20b1e55f24a87868d661fc7b033bbbbd48b1a918

Conflicts:

• Vagrantfile Polyam-glitch used different ports to allow running besides source. Changed ports back.
• app/helpers/application_helper.rb Upstream moved lines modified for polyam-glitch. Moved as upstream and re-applied modifications.
• app/javascript/packs/public.tsx Upstream made modifications to code moved to core/embed.ts Applied changes to different file and ported changes to core/admin.ts
• app/lib/themes.rb Upstream made code changes close to polyam-glitch change. Applied code change

Skipped changes:

• 906a3996343a9f94b79dc8ef91fc0ca3c04f1719 (Polyam-glitch doesn't have test files in frontend)
• 6ac90d4c5da2cf82fff4a6b1403db15b68d79883 (Polyam-glitch doesn't have test files for frontend)

Ported changes:

• 37d984b8bf19f86a8a371a97d8a1a000022448b3 (Also to glitch flavour)
• c6da3ee828ba2f8ddadfbb8b51a6fba90abc6824
• 1c87cb8019bafd2eb5b126ed0e9186ce20e94b1e
• 730e2127e1fa0e81952bb83d91cede91d8b47b72

Additional changes:

• 646da4240c78260c607c99dc5eea950f17b73dca
• e59424a39469bcd471e3f8d90a76102543c20690
• fa18c362c9b1c0ced528cf3ca21bff02ba13326f

---

Merge upstream up to a15139bc02d279b9ef85e95990f41e3e88838d20

Conflicts:

• .rubocop_todo.yml Upstream removed config close to additional ones for polyam-glitch. Removed config.
• Gemfile Upstream changed order causing duplicate gem. Removed duplicate gem.
• README.md Polyam-glitch has its own readme. Discarded changes.
• app/controllers/accounts_controller.rb Upstream changed "where" to a scope. Glitch/Polyam use an additional scope for non-local-only toots. Changed "where" to scope.
• app/helpers/theme_helper.rb Upstream made changes to function modified due to theming system. Ported upstream changes.
• app/javascript/mastodon/locales/en-GB.json Upstream added new strings close to ones modified to say "toot". Added strings and kept "toot".
• app/javascript/mastodon/locales/en.json Upstream added new string close to ones modified to say "toot". Added string, kept "toot".
• app/lib/account_statuses_filter.rb Upstream changed where-clause to scope. Ported change.
• app/models/account.rb Upstream added constant already present for polyam-glitch. Changed value to keep env var.
• app/models/custom_filter.rb Upstream changed a query modified for instance filter. Ported change.
• config/locales/en-GB.yml Upstream added new string close to one modified to say "toot". Added string and changed "post"s to "toot"

Skipped changes:

• 4117c8f6b88f72a9f2a3177f2c02708b7e05c772 (Depends on a skipped change)

Ported changes:

• c386c36866881ac3bd3d0b156264231f7b4c8053
• 66ee0d4a1f35ce4455418921879b8d2f96538d57 (Also to glitch flavour)

---

Merge upstream up to 32ead51e5a8d6abbc0b4bacb00192ddc72a9817a

Conflicts:

• None

Ported changes:

• 75163d9daf831a0562bcf35bffb883c2e7b239b7
• 32ead51e5a8d6abbc0b4bacb00192ddc72a9817a (SCSS changes)