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

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

environments

…

initializers

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

2019-05-04 16:37:26 +02:00

locales

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

2019-05-04 16:37:26 +02:00

webpack

Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)

2019-03-30 01:41:35 +01:00

application.rb

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

2019-03-20 13:54:00 +01:00

boot.rb

…

brakeman.ignore

Add type, limit, offset, min_id, max_id, account_id to search API (#10091)

2019-02-26 15:21:36 +01:00

database.yml

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

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

deploy.rb

Use the bundled Capistrano version (#9855)

2019-01-18 21:31:11 +01:00

environment.rb

…

i18n-tasks.yml

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

2019-02-10 21:10:09 +01:00

navigation.rb

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

2019-04-10 09:16:08 +02:00

puma.rb

…

routes.rb

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

2019-04-10 09:16:08 +02:00

secrets.yml

…

settings.yml

Add site-wide options to show reblogs and replies in local/public timelines

2019-05-01 22:33:09 +02:00

sidekiq.yml

…

webpacker.yml

Do not try to parse gif files as CSS or JS

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