Thibaut Girka 2d8be0a6e1 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `.env.production.sample`:
  Upstream changed it completely.
  Changed ours to merge upstream's new structure, but
  keeping most of the information.

2020-07-05 19:35:56 +02:00

..

environments

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

2019-09-05 11:36:41 +02:00

initializers

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

2020-07-01 19:23:14 +02:00

locales

Run bundle exec i18n-tasks normalize (#14205)

2020-07-03 13:27:02 +02:00

locales-glitch

Add support for setting Content Warning for CW-less outgoing toots

2020-05-30 18:27:00 +02:00

webpack

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

2020-06-09 10:39:20 +02: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

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

2020-07-01 19:23:14 +02:00

navigation.rb

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

2020-01-24 14:37:06 +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 'master' into glitch-soc/merge-upstream

2020-06-30 23:00:20 +02:00

secrets.yml

…

settings.yml

Add support for setting Content Warning for CW-less outgoing toots

2020-05-30 18:27:00 +02:00

sidekiq.yml

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

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

webpacker.yml

Do not try to parse gif files as CSS or JS

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