Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
features
fixtures	Fix undefined method error in sidekiq (#9807)	2019-01-14 17:28:41 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
mailers	Improve e-mail digest (#9689)	2019-01-02 10:47:32 +01:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
presenters	Change instance_presenter_spec to point to glitch-soc instead of tootsuite	2018-12-23 11:45:26 +01:00
requests
routing
serializers/activitypub	Improved remote thread fetching (#10106)	2019-02-28 15:22:21 +01:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-28 21:35:53 +01:00
support
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-12 20:32:48 +01:00
views
workers	Improved remote thread fetching (#10106)	2019-02-28 15:22:21 +01:00
rails_helper.rb	Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)	2019-01-15 23:11:46 +01:00
spec_helper.rb