Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.		2020-09-07 09:21:38 +02:00
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-30 16:13:08 +02:00
locales	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
locales-glitch	Add support for setting Content Warning for CW-less outgoing toots	2020-05-30 18:27:00 +02:00
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-01 17:02:18 +02:00
application.rb	Add color extraction for audio thumbnails (#14209)	2020-07-05 18:28:25 +02:00
boot.rb	Fix bootsnap cache directory being declared relatively (#9511)	2018-12-13 05:19:52 +01:00
brakeman.ignore	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	2019-03-08 14:36:28 +01:00
deploy.rb	Bump capistrano from 3.14.0 to 3.14.1 (#14037)	2020-06-17 06:31:30 +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 'master' into glitch-soc/merge-upstream	2020-08-30 16:13:08 +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 'master' into glitch-soc/merge-upstream	2020-09-07 09:21:38 +02:00
secrets.yml
settings.yml	Add support for setting Content Warning for CW-less outgoing toots	2020-05-30 18:27:00 +02:00
sidekiq.yml	Change trending hashtags to not disappear instantly after midnight (#11712)	2019-09-02 18:11:13 +02:00
webpacker.yml	Do not try to parse gif files as CSS or JS	2019-03-16 14:23:50 +01:00