Claire 29b5c5f483 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Slight refactor upstream, next to a line that was different in glitch-soc because of our local configurable limits on custom emoji size. Ported upstream changes. - `yarn.lock`: Not really a conflict, upstream dependency textually too close to a glitch-soc-only dependency. Updated upstream dependency as upstream.		2021-09-30 00:01:20 +02:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-27 11:29:03 +02:00
locales	Fix suspicious sign-in mail text being out of date (#16690)	2021-09-04 16:44:50 +02:00
locales-glitch	Fix typo on simple_form.ko.yml	2021-08-06 20:06:05 +02:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-02 10:52:09 +02:00
application.rb	Switch from unmaintained paperclip to kt-paperclip (#16724)	2021-09-29 23:52:36 +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	Ignore brakeman false positive warning (#16213)	2021-05-11 14:18:33 +02:00
database.yml
deploy.rb	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	2021-07-13 15:46:20 +02:00
environment.rb
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-09 23:25:49 +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
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-09 23:25:49 +02:00
secrets.yml
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
sidekiq.yml	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml