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

Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.

2018-09-11 16:51:26 +02: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-09-11 16:51:26 +02:00

helpers

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

2018-09-11 16:51:26 +02:00

javascript

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

2018-09-11 16:51:26 +02:00

lib

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

2018-08-31 19:10:57 +02:00

mailers

Fix low-hanging rubocop gripes (#8458)

2018-08-26 19:22:46 +02:00

models

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

2018-09-03 14:33:06 +02:00

policies

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

2018-08-24 15:10:34 +02:00

presenters

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

2018-08-24 15:10:34 +02:00

serializers

Let the front-end know the current account is a moderator

2018-09-03 18:19:11 +02:00

services

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

2018-09-11 16:51:26 +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-09-11 16:51:26 +02:00

workers

Add CLI task for rotating keys (#8466)

2018-08-26 20:21:03 +02:00