diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-09 16:38:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 16:38:09 +0100 |
| commit | c6b7b984891413cb1db673df2cbea12f8e6f0f05 (patch) | |
| tree | 46e3982da219f7a5ac34c3aecaf32f0990578d1d /app/controllers/api/v1 | |
| parent | e3682c9c1750e5e7e5d2f817e29f6760a18400ca (diff) | |
| parent | 4f59d1efd786c08cc63e0c14dceada80c37ab8da (diff) | |
Merge pull request #849 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1')
| -rw-r--r-- | app/controllers/api/v1/accounts/credentials_controller.rb | 2 |
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 dcd41b35c..e77f57910 100644 --- a/app/controllers/api/v1/accounts/credentials_controller.rb +++ b/app/controllers/api/v1/accounts/credentials_controller.rb @@ -21,7 +21,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController private def account_params - params.permit(:display_name, :note, :avatar, :header, :locked, :bot, fields_attributes: [:name, :value]) + params.permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, fields_attributes: [:name, :value]) end def user_settings_params |