Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.

2022-01-17 10:45:25 +01:00

..

environments

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-16 18:11:20 +01:00

initializers

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-16 18:11:20 +01:00

locales

Add notifications for statuses deleted by moderators (#17204)

2022-01-17 09:41:33 +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

…

navigation.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-12-16 16:20:44 +01:00

pghero.yml

…

puma.rb

…

routes.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-17 10:45:25 +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

…

webpacker.yml

…