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

Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.

2020-07-07 15:58:45 +02:00

..

environments

…

initializers

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

2020-07-07 15:58:45 +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

…

brakeman.ignore

Add E2EE API (#13820)

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

database.yml

…

deploy.rb

Bump capistrano from 3.14.0 to 3.14.1 (#14037)

2020-06-17 06:31:30 +02:00

environment.rb

…

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

…

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

…

webpacker.yml

…