David Yip 201e82686f Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
      app/javascript/styles/mastodon/components.scss

2018-01-17 18:37:09 -06:00

..

controllers

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

2018-01-17 18:37:09 -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

2018-01-08 10:17:15 +00:00

mailers

HTML e-mails for NotificationMailer (#6263)

2018-01-16 20:20:15 +01:00

models

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

2018-01-08 10:17:15 +00: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

2018-01-17 16:17:10 +00:00

support

…

validators

…

views

…

workers

Lists (#5703)

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

rails_helper.rb

Fix force_ssl conditional (#6201)

2018-01-07 15:19:23 +01:00

spec_helper.rb

…