Thibaut Girka 7039dca12c Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream ... Unlike upstream, kept the direct timeline endpoint, as it is still of use in glitch-soc.		2019-07-07 13:49:31 +02:00
..
controllers	Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream	2019-07-07 13:49:31 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-28 21:36:50 +02:00
features	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
fixtures	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-04 16:21:39 +02:00
mailers	Add invite request to pending account notification e-mail (#10528)	2019-04-10 00:36:01 +02:00
models	Remove deprecated REST API GET /api/v1/timelines/direct (#11212)	2019-07-05 02:14:56 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
requests	Redesign landing page (#10232)	2019-03-12 17:34:00 +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-06-26 23:19:22 +02:00
support
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-19 21:53:44 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
workers	Fix account URI in UpdatePollSerializer (#11194)	2019-06-27 19:41:55 +02: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