Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.		2019-10-03 11:10:12 +02:00
..
chewy	Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041)	2019-10-02 20:04:46 +02:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
mailers	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00