Thibaut Girka 3baacf6993 Merge branch 'master' into glitch-soc/merge-upstream		2020-05-13 22:11:49 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
fabricators	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
features	Add submit button to the top of preferences pages (#13068)	2020-03-08 16:04:03 +01:00
fixtures
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-04 21:47:37 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
presenters
requests
routing
serializers/activitypub
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +02:00
support	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-03 09:22:58 +01:00
views
workers	Fix RefollowWorker not keeping show_reblogs setting (#12707)	2020-01-02 20:52:39 +01:00
rails_helper.rb	Bump sidekiq from 5.2.7 to 6.0.4 (#11727)	2020-03-21 12:04:54 +09:00
spec_helper.rb	Move rspec examples to tmp dir (#12539)	2019-12-02 19:55:08 +01:00