Thibaut Girka 4e66e0ac04 Merge upstream SCSS changes for /about, /about/more and /terms ...

Port various commits to glitch-soc, mainly commits
0dcc1950d1 and
5b8603879f.

2018-08-10 16:22:49 +02:00

..

chewy

…

controllers

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

helpers

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

javascript

Merge upstream SCSS changes for /about, /about/more and /terms

2018-08-10 16:22:49 +02:00

lib

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

mailers

…

models

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

policies

Disallow remote users from viewing local-only toots

2018-07-31 15:41:04 +02:00

presenters

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

serializers

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

services

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +02:00

validators

Merge branch 'master' into glitch-soc/merge-upstream

2018-07-26 21:22:43 +02:00

views

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

workers

Fix ActivityPub::UpdateDistributionWorker regression (#8039)

2018-07-16 18:43:22 +02:00