Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 05:07:39 +02:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
locales	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
locales-glitch	Use DEFAULT_FIELDS_SIZE/MAX_PROFILE_FIELDS value in settings form hint (#1870)	2022-10-21 12:01:37 +02:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
application.rb	Remove Rack::Deflater (#17937)	2022-08-13 15:40:00 +02:00
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	2021-09-19 14:42:32 +09:00
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
database.yml	Format JSON and YAML using Prettier (#17823)	2022-03-21 04:46:11 +01:00
deploy.rb	Bump capistrano from 3.17.0 to 3.17.1 (#18949)	2022-08-15 07:50:50 +09:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	2020-05-04 13:52:41 +02:00
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	2019-09-04 20:44:08 +02:00
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
secrets.yml
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
sidekiq.yml	Add retention policy for cached content and media (#19232)	2022-09-27 03:08:19 +02:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml	Do not try to parse gif files as CSS or JS	2019-03-16 14:23:50 +01:00