David Yip 82b2e224a2 Merge branch 'gs-master' into prevent-local-only-federation ...

Conflicts:
	db/schema.rb

2017-12-15 12:20:56 -06:00

..

controllers

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2017-12-12 02:54:13 -06:00

fabricators

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2017-12-12 02:54:13 -06:00

features

…

fixtures

…

helpers

…

lib

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-11-30 03:17:12 +00:00

mailers

…

models

Examples for Status.as_public_timeline.

2017-12-14 02:57:59 -06:00

policies

…

presenters

Add tests for AccountRelationshipsPresenter (#5805)

2017-11-24 14:41:04 +01:00

requests

…

routing

…

services

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-06 20:17:13 +00:00

support

…

validators

…

views

…

workers

Lists (#5703)

2017-11-18 00:16:48 +01:00

rails_helper.rb

…

spec_helper.rb

…