Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.		2020-01-04 23:04:42 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
fabricators	Add bookmarks (#7107)	2019-11-13 23:02:10 +01:00
features	Add feature test that tests behaviour of profile name and bio (#12658)	2020-01-03 02:44:06 +01:00
fixtures	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
lib	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
mailers	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
middleware	Fix uncaught query param encoding errors (#12741)	2020-01-02 17:14:58 +01:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
presenters
requests	Fix localization test failing due to order of locale definitions (#12393)	2019-11-15 21:00:09 +01:00
routing
serializers/activitypub
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01: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	2019-08-06 13:16:53 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
workers	Fix RefollowWorker not keeping show_reblogs setting (#12707)	2020-01-02 20:52:39 +01:00
rails_helper.rb	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
spec_helper.rb	Move rspec examples to tmp dir (#12539)	2019-12-02 19:55:08 +01:00