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

..

controllers

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

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

fabricators

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

2018-08-28 17:24:39 +02:00

features

…

fixtures

…

helpers

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

2018-08-26 14:23:24 +02:00

lib

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

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

mailers

…

models

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

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

policies

Add test to disallow remote users from fetching local-only toots

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

presenters

…

requests

…

routing

…

services

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

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

support

…

validators

…

views

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

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

workers

…

rails_helper.rb

feat(cookies): Use the same-site attribute to lax (#8626)

2018-09-08 23:54:28 +02:00

spec_helper.rb

…