Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 22:14:26 +02:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-19 18:51:41 +01:00
locales	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
locales-glitch	translation glitch's preferences [ja]	2021-10-20 13:04:50 +09: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
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
pghero.yml
puma.rb
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
secrets.yml
settings.yml
sidekiq.yml	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
storage.yml
webpacker.yml