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

Conflicts:
- `README.md`:
  We have completely different contents. Kept our version.
- `package.json`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `streaming/index.js`:
  Conflict due to code style changes on parts that were
  modified in glitch-soc to handle local-only toots.
  Changed style according to upstream.

2021-12-27 15:16:18 +01:00

..

environments

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

2021-12-27 15:16:18 +01:00

initializers

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

2021-12-27 15:16:18 +01:00

locales

Add ability for admins to delete canonical email blocks (#16644)

2021-12-17 23:02:14 +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

config: add DB_SSLMODE for managed/remote PG (#10210)

2019-03-08 14:36:28 +01:00

deploy.rb

Change references to tootsuite/mastodon to mastodon/mastodon (#16491)

2021-07-13 15:46:20 +02:00

environment.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

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-12-16 16:20:44 +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

Add PERSISTENT_TIMEOUT option (#11756)

2019-09-04 20:44:08 +02:00

routes.rb

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

2021-12-18 11:44:54 +01:00

secrets.yml

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

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

Do not try to parse gif files as CSS or JS

2019-03-16 14:23:50 +01:00