This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Kay Faraday 390fd84e20 Merge branch 'main' of https://github.com/glitch-soc/mastodon into fork		2021-12-03 03:45:24 +00:00
..
environments	Merge branch 'main' of https://github.com/glitch-soc/mastodon into fork	2021-12-03 03:45:24 +00:00
initializers	Merge branch 'main' of https://github.com/glitch-soc/mastodon into fork	2021-12-03 03:45:24 +00:00
locales	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
locales-glitch	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-02 10:52:09 +02:00
application.rb	Add S3_FORCE_SINGLE_REQUEST env var to work around S3 compatibility issues (#16866)	2021-10-18 18:29:04 +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	Add trending links (#16917)	2021-11-25 13:07:38 +01: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-11-26 22:53:55 +01:00
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	2020-05-04 13:52:41 +02:00
puma.rb	…
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
secrets.yml	…
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
sidekiq.yml	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml	…