Thibaut Girka ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code		2019-11-20 15:36:09 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-20 15:36:09 +01:00
fabricators	Add bookmarks (#7107)	2019-11-13 23:02:10 +01:00
features	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02: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/merge-upstream	2019-11-06 14:38:28 +01: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-11-06 14:38:28 +01: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-03-14 17:17:20 +01:00
requests	Fix localization test failing due to order of locale definitions (#12393)	2019-11-15 21:00:09 +01:00
routing
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	2019-06-27 19:41:55 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-20 15:36:09 +01:00
support
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 various issues with account migration (#12301)	2019-11-07 09:05:07 +02:00
rails_helper.rb	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
spec_helper.rb	Store rspec statuses in .cache/rspec (#12427)	2019-11-19 17:22:40 +01:00