Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-19 15:17:14 +00:00
parent 3d033a4687 66105929e0
commit 1445ba1703
25 changed files with 193 additions and 60 deletions
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@ -20,6 +20,6 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
  private

  def account_params
-    params.permit(:display_name, :note, :avatar, :header)
+    params.permit(:display_name, :note, :avatar, :header, :locked)
  end
 end