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
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
features
fixtures
helpers
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
presenters
requests
routing
serializers/activitypub
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
support
validators
views
workers
rails_helper.rb	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
spec_helper.rb