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

2019-10-04 19:49:43 +02:00
parent 360234d1bf 83d3e7733d
commit 1bbba0016a
31 changed files with 419 additions and 81 deletions
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@ -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