David Yip 7174d1c955 Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/javascript/images/mastodon-drawer.png
	app/javascript/styles/mastodon/components.scss

2017-12-26 22:24:19 -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

Fix XML oEmbed support discovery (#6104)

2017-12-27 03:29:49 +01:00

helpers

Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00

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

Update StatusPolicy to check current_account for local_only? toots.

2017-11-17 09:07:21 -06:00

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

Remove empty strings (#5732)

2017-11-17 10:52:30 +09:00

validators

…

views

…

workers

Lists (#5703)

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

rails_helper.rb

…

spec_helper.rb

…