mastodon/config
Claire fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
2025-01-27 18:19:09 +01:00
..
environments Use a system setting for the Referer policy (#33239) 2024-12-10 13:16:52 +00:00
imagemagick
initializers Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream 2025-01-27 18:19:09 +01:00
locales New Crowdin Translations (automated) (#33731) 2025-01-27 08:39:56 +00:00
locales-glitch New Crowdin Translations (automated) (#2907) 2024-12-23 18:28:38 +01:00
routes Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
templates Change “Prohibited uses” section of ToS template according to feedback (#33703) 2025-01-23 14:09:33 +00:00
webpack Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream 2025-01-21 19:23:25 +01:00
application.rb Update `rails` to version 8.0.1 (#32357) 2025-01-03 16:08:21 +00:00
boot.rb
brakeman.yml
captcha.yml
database.yml
environment.rb
formatjs-formatter.js
i18n-tasks.yml
mastodon.yml Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 2025-01-14 20:38:32 +01:00
navigation.rb Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream 2025-01-06 20:36:25 +01:00
pghero.yml
puma.rb Add an optional metric exporter (#33734) 2025-01-27 12:52:30 +00:00
roles.yml
routes.rb Extend custom CSS cache time with digest paths (#33207) 2025-01-08 08:48:45 +00:00
settings.yml Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
sidekiq.yml
translation.yml
webpacker.yml