Baptiste Lemoine 2d77a5e767 merge master

2020-11-01 09:55:09 +01:00

..

environments

add ssl option in smtp setting (#14309)

2020-07-15 14:43:49 +02:00

initializers

merge master

2020-11-01 09:55:09 +01:00

locales

merge master

2020-11-01 09:55:09 +01:00

webpack

merge master

2020-11-01 09:55:09 +01:00

application.rb

Add color extraction for audio thumbnails (#14209)

2020-07-05 18:28:25 +02:00

boot.rb

Fix bootsnap cache directory being declared relatively (#9511)

2018-12-13 05:19:52 +01:00

brakeman.ignore

Add E2EE API (#13820)

2020-06-02 19:24:53 +02:00

database.yml

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

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

deploy.rb

Bump capistrano from 3.14.0 to 3.14.1 (#14037)

2020-06-17 06:31:30 +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 IP-based rules (#14963)

2020-10-12 16:33:49 +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 follower synchronization mechanism (#14510)

2020-10-21 18:04:09 +02:00

secrets.yml

Upgrade to Rails 5.0.0.1

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

settings.yml

merge master

2020-11-01 09:55:09 +01:00

sidekiq.yml

Change trending hashtags to not disappear instantly after midnight (#11712)

2019-09-02 18:11:13 +02:00

themes.yml

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

2020-02-12 10:03:28 +01:00

webpacker.yml

add config to webpacker

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