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

…

fixtures

Export and import show_reblogs together with following list (#10495)

2019-04-08 07:28:27 +02:00

helpers

…

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

…

presenters

…

requests

…

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

…

workers

Fix account URI in UpdatePollSerializer (#11194)

2019-06-27 19:41:55 +02:00

rails_helper.rb

…

spec_helper.rb

…