Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream changed one import, close to a glitch-soc-only import to handle different max character counts. Ported upstream's change.		2023-10-24 18:41:20 +02:00
..
environments	Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream	2023-10-08 17:21:12 +02:00
imagemagick	Fix AVIF attachments (#26264)	2023-08-01 19:34:11 +02:00
initializers	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	2023-10-19 19:14:04 +02:00
locales	New Crowdin Translations (automated) (#27490)	2023-10-23 10:04:54 +02:00
locales-glitch	New Crowdin translations (#2388)	2023-08-29 08:28:45 +02:00
routes	Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream	2023-09-15 21:39:21 +02:00
webpack	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +02:00
application.rb	Autofix Rubocop cops for config/ (#24145)	2023-10-03 15:24:12 +02:00
boot.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
brakeman.yml	Configure brakeman to ignore url safe preview card urls (#25883)	2023-10-20 15:32:16 +02:00
database.yml	Change `DB_REPLICA_*` environment variables to `REPLICA_DB_*` (#26386)	2023-08-08 13:59:40 +02:00
deploy.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
environment.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
formatjs-formatter.js	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream	2023-06-10 12:38:33 +02:00
i18n-tasks.yml	Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream	2023-09-02 14:44:47 +02:00
navigation.rb	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +02:00
pghero.yml	…
puma.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream	2023-10-08 17:21:12 +02:00
secrets.yml	…
settings.yml	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
sidekiq.yml	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml	Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream	2023-09-02 13:31:15 +02:00