Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

2018-12-23 11:28:28 +01:00

..

chewy

Get rid of Chewy order/limit warning (#8355)

2018-08-22 02:44:56 +02:00

controllers

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

2018-12-23 11:28:28 +01:00

helpers

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

2018-12-23 11:28:28 +01:00

javascript

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

2018-12-23 11:28:28 +01:00

lib

Add a per-user setting to hide followers count

2018-12-20 14:51:12 +01:00

mailers

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

models

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

2018-12-23 11:28:28 +01:00

policies

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

2018-12-23 11:28:28 +01:00

presenters

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

2018-11-29 19:22:52 +01:00

serializers

Add a per-user setting to hide followers count

2018-12-20 14:51:12 +01:00

services

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

2018-12-18 16:55:15 +01:00

validators

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

2018-12-15 10:45:53 +01:00

views

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

2018-12-23 11:28:28 +01:00

workers

Do no retry web push workers if the server returns a 4xx response (#9434)

2018-12-17 03:14:13 +01:00