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.
This commit is contained in:
Thibaut Girka
2018-09-11 16:51:26 +02:00
27 changed files with 506 additions and 148 deletions

View File

@@ -128,6 +128,10 @@ class ApplicationController < ActionController::Base
protected
def truthy_param?(key)
ActiveModel::Type::Boolean.new.cast(params[key])
end
def forbidden
respond_with_error(403)
end