about summary refs log tree commit diff
path: root/app/controllers/api/v1
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-02-19 15:17:14 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-02-19 15:17:14 +0000
commit1445ba17033cdfdd21d0999f65267754af6344af (patch)
tree4919ecd746c8dec4be33af47d83f11cec098cf69 /app/controllers/api/v1
parent3d033a468748338b6036cb24bb00ea4e88656ae6 (diff)
parent66105929e07fc7ddbdb8b66696b9ce1ed5d25957 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/api/v1')
-rw-r--r--app/controllers/api/v1/accounts/credentials_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index da534d960..68af22529 100644
--- 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