Merge tag 'v3.0.0' into glitch-soc/merge-upstream

This commit is contained in:
Thibaut Girka committed 2019-10-04 19:49:43 +02:00
commit 1bbba0016a
31 files changed
+419 -81

No files matched your search

@@ -78,7 +78,7 @@ class Api::V1::AccountsController < Api::BaseController
end
def account_params
params.permit(:username, :email, :password, :agreement, :locale)
params.permit(:username, :email, :password, :agreement, :locale, :reason)
end
def check_enabled_registrations