Merge upstream changes up to a2399046ca600d492b492b8dae88011de687bece

[ClearlyClaire]

⚠️ Mastodon requires new environment variables to be set. Set ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY, ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT, and ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY with new secrets (you can call bin/rails db:encryption:init to generate a set of secrets) before restarting Mastodon.

⚠️ Support for Ruby 3.0 has been dropped.

Merge upstream changes up to 02ea161

Conflicts

Conflicts:

• app/lib/themes.rb
• app/views/layouts/application.html.haml
• app/views/layouts/embedded.html.haml
• app/views/layouts/error.html.haml
• config/settings.yml

All these conflicts are because glitch-soc and upstream have different theming systems and upstream changed a few things to have dynamic theme selection based on system settings.

Conflicts were solved to take that into account, and current_theme has been changed in the process to return a tuple of [flavour, skin] to be used in the theme_style_tags helper.

Ported changes

• 02ea161

Merge upstream changes up to d49343e

Conflicts

None

Ported changes

• b2d841c

Merge upstream changes up to 8a498f4

Conflicts

None

Ported changes

• 27d014a
• 9fbe8d3
• b9982ce
• c913e2f
• f2fd1da
• d088964
• 961bb84
• 4f068d4

Merge upstream changes up to 672c9f5

Conflicts

• app/helpers/application_helper.rb:
  Conflict due to our theming system being different.
  Ported upstream's changes.

Ported changes

• 67442f9

Merge upstream changes up to 90eb4a5

Conflicts

None

Ported changes

• 69e5771
• 430da03
• 90eb4a5

Merge upstream changes up to 143d955

Conflicts

• yarn.lock:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependencies as well.

Merge upstream changes up to c70c39c

Ported changes

• fa95740
• 0763522
• e47a3d0
• b4d991a

Merge upstream changes up to d27eb18

Conflicts

• spec/requests/api/v2/instance_spec.rb:
  Conflict due to glitch-soc having a different default site name.
  Updated the tests as upstream did, keeping glitch-soc's default name.

Ported changes

• 0b9d410

Merge upstream changes up to 4045c06

Ported changes

• 5d67247
• e284417
• c6da3ee

Merge upstream changes up to 52ab8a5

Ported changes

• 1c87cb8

Merge upstream changes up to b61ae28

Conflicts

• app/helpers/application_helper.rb:
  Conflict because of our different theming systems.
  Updated accordingly, along with app/helpers/theme_helper.rb and app/helpers/theme_helper_spec.rb.

Merge upstream changes up to 20b1e55

Ported changes

• 730e212

Merge upstream changes up to 34e826f

Conflicts

• app/helpers/theme_helper.rb:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
• app/models/account.rb:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream.

Ported changes

• c386c36
• 37d984b

Merge upstream changes up to 0622107

Ported changes

• 4117c8f
• 66ee0d4

Merge upstream changes up to a390299

Conflicts

• app/controllers/accounts_controller.rb:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
• app/lib/account_statuses_filter.rb:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.

Merge upstream changes up to ec71c02

Conflicts

• Gemfile:
  There was an extra newline in glitch-soc for some reason.
  Removed it.

Merge upstream changes up to a15139b

No conflicts nor anything to port.

Merge upstream changes up to a239904

No conflicts nor anything to port.