Tykayn bbb7b36752 Merge remote-tracking branch 'up/main'

2021-11-14 18:46:54 +01:00

..

environments

Default to system ca-certificates.crt if none is specified (#10857)

2021-10-14 21:05:50 +02:00

initializers

Merge remote-tracking branch 'up/main'

2021-11-14 18:46:54 +01:00

locales

Merge branch 'main' of https://github.com/mastodon/mastodon

2021-10-22 10:36:12 +02:00

webpack

Merge branch 'main' of https://github.com/mastodon/mastodon

2021-10-22 10:36:12 +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

Ignore brakeman false positive warning (#16213)

2021-05-11 14:18:33 +02: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

Change move handler to carry blocks over (#14144)

2020-07-01 13:51:15 +02:00

navigation.rb

Add feature to automatically delete old toots (#16529)

2021-08-09 23:11:50 +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

Add remove from followers api (#16864)

2021-10-18 12:02:35 +02:00

secrets.yml

Upgrade to Rails 5.0.0.1

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

settings.yml

Merge branch 'main' of https://github.com/tootsuite/mastodon

2021-05-24 11:09:13 +02:00

sidekiq.yml

Add feature to automatically delete old toots (#16529)

2021-08-09 23:11:50 +02:00

storage.yml

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

themes.yml

up theme bliss, remove postcss

2021-05-24 12:10:49 +02:00

webpacker.yml

add config to webpacker

2019-12-13 17:13:29 +01:00